Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #973 from MARTINI1/es-upd2
Browse files Browse the repository at this point in the history 
Update spanish strings and extract more hardcode text
  • Loading branch information
@nahojjjen
nahojjjen authored Oct 17, 2018
2 parents 2b4b990 + 74b9edd commit 38c5521
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 16 deletions.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_ocr_calibration_result.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@
android:id="@+id/manualAdjustButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Adjust manually"/>
android:text="@string/calibration_result_manual_title" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:text="If automatic calibration fails, you can manually edit the scan fields. Sorry. This feature is in beta, if automatic calibration works for you, it's most likely better to not bother manually changing it."
android:text="@string/calibration_result_manual_desc"
android:textSize="12sp" />

</LinearLayout>
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/res/layout/activity_ocr_manual_calibration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#2e000000"></LinearLayout>
android:background="#2e000000"/>

<android.support.v7.widget.CardView
android:id="@+id/floatingEditField"
Expand Down Expand Up @@ -69,7 +69,7 @@
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Click a field for details"
android:text="@string/manual_calibration_field_detail"
app:layout_constraintStart_toStartOf="@id/floatingEditFieldConstraint"
app:layout_constraintTop_toBottomOf="@id/dragUpDownArea"
tools:layout_editor_absoluteY="48dp"/>
Expand All @@ -79,7 +79,7 @@
android:id="@+id/fieldExplanation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="You can drag this window up and down if it's in the way."
android:text="@string/manual_calibration_drag_window"
app:layout_constraintStart_toStartOf="@id/floatingEditFieldConstraint"
app:layout_constraintTop_toBottomOf="@id/fieldExplanationHead"/>

Expand All @@ -89,7 +89,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="Param1"
android:text="@string/manual_calibration_param1"
app:layout_constraintTop_toBottomOf="@id/fieldExplanation"/>

<SeekBar
Expand All @@ -106,7 +106,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="Param2"
android:text="@string/manual_calibration_param2"
app:layout_constraintTop_toBottomOf="@id/param1Seekbar"/>

<SeekBar
Expand All @@ -121,10 +121,9 @@
android:id="@+id/saveManualCalibrationButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Save \n&amp; exit"
android:text="@string/manual_calibration_save_exit"
app:layout_constraintBottom_toBottomOf="@id/floatingEditFieldConstraint"
app:layout_constraintEnd_toEndOf="@id/floatingEditFieldConstraint"/>
>

</android.support.constraint.ConstraintLayout>

Expand Down
9 changes: 2 additions & 7 deletions app/src/main/res/layout/fraction_appraisal.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,16 +291,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
android:orientation="horizontal">
<Button
android:id="@+id/btnBackAppr"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:text="Back" />
android:text="@string/back" />

<Button
android:id="@+id/btnCheckIv"
Expand All @@ -311,10 +310,6 @@
android:layout_marginLeft="16dp"
android:text="@string/check_iv" />





</LinearLayout>

</LinearLayout>
45 changes: 45 additions & 0 deletions app/src/main/res/values-es/forms.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="formNames">
<!-- #368 Deoxys -->
<item>Forma ataque</item>
<item>Forma defensa</item>
<item>Forma velocidad</item>
<!-- #103 Exeggutor -->
<item>de Alola</item>
<!-- #19 Rattata -->
<item>de Alola</item>
<!-- #20 Raticate -->
<item>de Alola</item>
<!-- #26 Raichu -->
<item>de Alola</item>
<!-- #27 Sandshrew -->
<item>de Alola</item>
<!-- #28 Sandslash -->
<item>de Alola</item>
<!-- #37 Vulpix -->
<item>de Alola</item>
<!-- #38 Ninetales -->
<item>de Alola</item>
<!-- #50 Diglett -->
<item>de Alola</item>
<!-- #51 Dugtrio -->
<item>de Alola</item>
<!-- #52 Meowth -->
<item>de Alola</item>
<!-- #53 Persian -->
<item>de Alola</item>
<!-- #74 Geodude -->
<item>de Alola</item>
<!-- #75 Graveler -->
<item>de Alola</item>
<!-- #76 Golem -->
<item>de Alola</item>
<!-- #88 Grimer -->
<item>de Alola</item>
<!-- #89 Muk -->
<item>de Alola</item>
<!-- #105 Marowak -->
<item>de Alola</item>
</string-array>
</resources>
34 changes: 34 additions & 0 deletions app/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@
<string name="powerup_calc_instructions">Cálculo de mejoras y evolución\nDesliza el slider para visualizar diferentes predicciones</string>
<string name="evolution">Evolución</string>
<string name="level">Nivel</string>
<string name="level_acronym">NVL</string>
<string name="level_num">Nivel %1$s</string>
<string name="possible_iv_combinations" tools:ignore="PluralsCandidate">"%1$d posibles combinaciones de IV"</string>
<string name="check_cp_or_level">¡Algo salió mal! Comprueba que los valores introducidos son correctos y que GoIV tiene el nivel de entrenador correcto en la pantalla de inicio.</string>
<string name="appraisal">Valoración</string>
<string name="appraisal_refining">Refinación adicional</string>
<string name="attack">Ataque</string>
<string name="defense">Defensa</string>
Expand All @@ -82,6 +84,7 @@
<string name="pokespam_formatted_message">%1$d (%2$d filas + %3$d más)</string>
<string name="pokespam_formatted_message2">%1$d (%2$d filas)</string>
<string name="candy">Caramelos</string>
<string name="stardust">Polvos estelares</string>
<string name="pokespam_not_available">No disponible</string>
<string name="pokespam_setting_title">Mostrar cantidad evolucionable</string>
<string name="pokespam_setting_summary">Esta característica activa el escaneo de la cantidad de caramelos y le permite ver cuántos Pokémon puede evolucionar, útil para usar con huevo de la suerte</string>
Expand Down Expand Up @@ -270,4 +273,35 @@
<string name="send_email_to_devs_button">Email con información sobre el error para desarrolladores</string>
<string name="report_error">Email de informe de error</string>
<string name="recalibration_video_tutorial">Videotutorial recalibración</string>
<string name="recalibrating_please_wait">Recalibrando, por favor espere 3 segundos&#8230;</string>
<string name="moveset_score_disclaimer">"Puntuación basada en los datos de simulación de pokebattler.com.\nLas simulaciones se basan en combates en gimnasios, las incursiones a menudo tienen otros combos óptimos.\nEl combo óptimo puede cambiar en ciertos enfrentamientos.\nEsta puntuación es solo una guía."</string>
<string name="table_header_move_fast">Rápido</string>
<string name="table_header_move_charge">Cargado</string>
<string name="table_header_attack">Atq</string>
<string name="table_header_defense">Def</string>
<string name="fraction_input_title">Introducción</string>
<string name="fraction_powerup_title">Predicciones de potenciación</string>
<string name="fraction_powerup_tab_label">Potenciar</string>
<string name="fraction_powerup_paragraph_predictedstats">Estadísticas predichas</string>
<string name="fraction_powerup_paragraph_cost">Coste</string>
<string name="fraction_powerup_paragraph_input">Selección</string>
<string name="fraction_iv_title">Resultados escaneo IV</string>
<string name="fraction_iv_tab_label">IV</string>
<string name="fraction_moveset_title">Combos (beta)</string>
<string name="fraction_moveset_tab_label">Combos</string>
<string name="fraction_ivcombinations_title">Combinaciones de IV</string>
<string name="export_queue_copied">"Información Pokémon añadida al portapapeles.\nPegue esto en la pantalla de importación."</string>
<string name="export_queue_cleared">"Cola vacía"</string>
<string name="export_queue_added">"Añadido %1$s a la cola de exportación.\nTienes %2$d pokémon almacenados en la cola."</string>
<string name="button_add_to_queue">"Añadir a cola"</string>
<string name="button_clear_to_queue">"Limpiar cola"</string>
<string name="button_export_to_pokebattler">Exportar cola a PokeBattler</string>
<string name="manual_calibration_label">Calibración manual</string>
<string name="calibration_result_manual_title">Ajustar manualmente</string>
<string name="calibration_result_manual_desc">"Si la calibración automática falla, puede ajustar manualmente los campos a escanear. Esta función está en fase beta, si la calibración automática le funciona correctamente es mejor que no la cambie por la calibración manual."</string>
<string name="manual_calibration_field_detail">Haga clic en un campo para más detalles</string>
<string name="manual_calibration_drag_window">"Puede mover esta ventana arriba o abajo."</string>
<string name="manual_calibration_param1">Parámetro1</string>
<string name="manual_calibration_param2">Parámetro2</string>
<string name="manual_calibration_save_exit">"Guardar y salir"</string>
</resources>
7 changes: 7 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@
<string name="button_clear_to_queue">"Clear queue"</string>
<string name="button_export_to_pokebattler">Export Queue to PokeBattler</string>
<string name="manual_calibration_label">Manual calibration</string>
<string name="calibration_result_manual_title">Adjust manually</string>
<string name="calibration_result_manual_desc">"If automatic calibration fails, you can manually edit the scan fields. Sorry. This feature is in beta, if automatic calibration works for you, it's most likely better to not bother manually changing it."</string>
<string name="manual_calibration_field_detail">Click a field for details</string>
<string name="manual_calibration_drag_window">"You can drag this window up and down if it's in the way."</string>
<string name="manual_calibration_param1">Param1</string>
<string name="manual_calibration_param2">Param2</string>
<string name="manual_calibration_save_exit">"Save \n&amp; exit"</string>
<string name="fast_copy_to_clipboard">fastCopyToClipboard</string>
<string name="copy_to_clip_fast">Copy to clipboard on preview</string>
</resources>

0 comments on commit 38c5521

Please sign in to comment.