Skip to content

Commit

Permalink
ops
Browse files Browse the repository at this point in the history
Just translation fix
  • Loading branch information
alefesouza committed Jun 20, 2014
1 parent 87b8894 commit 4de28f5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
19 changes: 12 additions & 7 deletions res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
<string name="filter">Filtro</string>

<!--Di pokemon details-->
<string name="img_sugimori_desc">Sugimori art do Pokemon</string>
<string name="img_sprites_front">Sprite do Pokemon de frente</string>
<string name="img_sprites_back">Sprite do Pokemon de costas</string>
<string name="img_shiny_front">Shiny sprite do Pokemon de frente</string>
<string name="img_shiny_back">Shiny sprite do Pokemon de costas</string>
<string name="img_sugimori_desc">Sugimori art do Pokémon</string>
<string name="img_sprites_front">Sprite do Pokémon de frente</string>
<string name="img_sprites_back">Sprite do Pokémon de costas</string>
<string name="img_shiny_front">Shiny sprite do Pokémon de frente</string>
<string name="img_shiny_back">Shiny sprite do Pokémon de costas</string>
<string name="male_symbol">♂</string>
<string name="body_height">Altura</string>
<string name="body_weight">Largura</string>
<string name="body_weight">Peso</string>
<string name="base_exp">Base EXP</string>
<string name="base_effort">Esforço</string>
<string name="base_happiness">Felicidade</string>
Expand All @@ -71,7 +71,7 @@
<string name="stat_SA">Base SA</string>
<string name="stat_SD">Base SD</string>
<string name="stat_SPD">Base SPD</string>
<string name="data_japanese">Nome Japonês</string>
<string name="data_japanese">Nome japonês</string>
<string name="data_species">Espécie</string>
<string name="data_habitat">Habitat</string>
<string name="data_gender">Proporção de gênero</string>
Expand All @@ -87,6 +87,8 @@
<string name="changelog_show_full">mais…</string>
<string name="changelog_version_format">Versão <xliff:g id="version_name">%s</xliff:g></string>

<string name="searchhint">Nome do Pokémon</string>

<string name="download">Baixar imagens</string>
<string name="feedback">Enviar feedback</string>
<string name="update">Verificar atualizações</string>
Expand All @@ -99,6 +101,9 @@
<string name="serebii">Abrir no Serebii</string>

<string name="downloadwarning">Não feche o aplicativo durante o download</string>
<string name="extract">Extraindo</string>
<string name="extractdata">Extraindo dados</string>
<string name="extractfinish">Extração finalizada</string>

<string name="pref_color">Cor favorita</string>
<string name="pref_color_summary">Selecione a cor do aplicativo</string>
Expand Down
5 changes: 5 additions & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
<string name="changelog_show_full">more…</string>
<string name="changelog_version_format">Version <xliff:g id="version_name">%s</xliff:g></string>

<string name="searchhint">Pokemon\'s name</string>

<string name="download">Download image</string>
<string name="feedback">Send feedback</string>
<string name="update">Verify updates</string>
Expand All @@ -99,6 +101,9 @@
<string name="serebii">Open on Serebii</string>

<string name="downloadwarning">Not close the app while downloading</string>
<string name="extract">Extracting</string>
<string name="extractdata">Extracting data</string>
<string name="extractfinish">Extracting finished</string>

<string name="pref_color">Favorite color</string>
<string name="pref_color_summary">Select the application color</string>
Expand Down
2 changes: 1 addition & 1 deletion src/aloogle/pokedex/activity/ActivityPokemonFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ActivityPokemonFilter extends Activity {
private String generation, type, color;
private boolean isBaby, hasGenderDiff;

@Override
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.pokemon_filter);
Expand Down
10 changes: 5 additions & 5 deletions src/aloogle/pokedex/fragment/PokemonName.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

MenuItem searchItem = menu.findItem(R.id.action_search);
SearchView searchView = (SearchView) searchItem.getActionView();
searchView.setQueryHint("Pokemon's name");
searchView.setQueryHint(getString(R.string.searchhint));

searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
Expand Down Expand Up @@ -167,12 +167,12 @@ public void onReceive(Context ctxt, Intent intent) {
public class UnzipFile extends AsyncTask<ZipHelper,Void,Void> {
String zipLocation;
NotificationCompat.Builder notif;

@Override
protected void onPreExecute() {
notif = new NotificationCompat.Builder(activity);
notif.setContentTitle("Extracting " + zipName)
.setContentText("Extracting data")
notif.setContentTitle(getString(R.string.extract) + " " + zipName)
.setContentText(getString(R.string.extractdata))
.setSmallIcon(R.drawable.ic_extract)
.setProgress(0, 0, true);
notifManager.notify(0, notif.build());
Expand All @@ -191,7 +191,7 @@ protected void onPostExecute(Void result) {
File f = new File(zipLocation);
if (f.exists()) f.delete();

notif.setContentText("Extracting finished")
notif.setContentText(getString(R.string.extractfinish))
.setProgress(0, 0, false);
notifManager.notify(0, notif.build());
}
Expand Down

0 comments on commit 4de28f5

Please sign in to comment.