Skip to content

Spanish Translation: Copyable/Editable/AddRemove/SearchBar/PreviewNav #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Aug 26, 2020

Conversation

oruburos
Copy link
Collaborator

I have verified that this pull request:

  • has no linting errors (npm run lint)
  • is from a uniquely-named feature branch and has been rebased on top of the latest master. (If I was asked to make more changes, I have made sure to rebase onto master then too)
  • is descriptively named

…iew_assets

# Conflicts:
#	translations/locales/en-US/translations.json
#	translations/locales/es-419/translations.json
…d_preview_assets

# Conflicts:
#	translations/locales/en-US/translations.json
#	translations/locales/es-419/translations.json
… into add_preview_assets

# Conflicts:
#	translations/locales/en-US/translations.json
#	translations/locales/es-419/translations.json
…into add_preview_assets

# Conflicts:
#	translations/locales/en-US/translations.json
#	translations/locales/es-419/translations.json
…iew_assets

# Conflicts:
#	translations/locales/en-US/translations.json
#	translations/locales/es-419/translations.json
@oruburos
Copy link
Collaborator Author

@andrewn Can you have a look at this, please?

Copy link
Member

@andrewn andrewn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of minor naming things, then this is good to go!

…_prevNav

# Conflicts:
#	translations/locales/en-US/translations.json
#	translations/locales/es-419/translations.json
@oruburos
Copy link
Collaborator Author

@andrewn The issues were addressed, can you have a look, please?

andrewn
andrewn previously approved these changes Aug 26, 2020
Copy link
Member

@andrewn andrewn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks!

@andrewn
Copy link
Member

andrewn commented Aug 26, 2020

@oruburos can you fix the conflict and then I'll merge. Thanks!

…_prevNav

# Conflicts:
#	translations/locales/es-419/translations.json
@oruburos
Copy link
Collaborator Author

@andrewn Conflicts solved, can you have a look at this, please?

@andrewn andrewn merged commit f918669 into processing:develop Aug 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants