Skip to content
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

Update Spanish strings.xml #580

Merged
merged 12 commits into from
Feb 20, 2019
Merged

Update Spanish strings.xml #580

merged 12 commits into from
Feb 20, 2019

Conversation

MatiasMFM2001
Copy link
Contributor

Describe the pull request

I've finished translating the updated version of strings.txt. Perhaps you should check if it's all ok before applying changes

And I understood how to create a Pull Request. Yay!

Link to relevant issues
#500 #430 #494

<string name="error_username">Tienes que proporcione un nombre de usuario.</string>

<!-- Labels -->
<string name="apps">Aplicaciones</string>
Copy link
Member

Choose a reason for hiding this comment

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

We prefer just Apps here because this is a button label and there is not much room on the screen.

<!-- Menus -->
<string name="app_info">Información de Aplicación</string>
<string name="stop_app">Parar Aplicación</string>
<string name="kill_service">Matar Servicio</string>
Copy link
Member

@corbinlc corbinlc Feb 1, 2019

Choose a reason for hiding this comment

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

I know this says name="kill_service" but it is really stopping a session.

@MatiasMFM2001
Copy link
Contributor Author

Theoretically I've sumbitted the commits ("Aplicaciones" -> "Apps"; "Matar Servicio" -> "Parar Sesión")

@corbinlc
Copy link
Member

corbinlc commented Feb 4, 2019

I am ok with this translation. Can @MatthewTighe or @luongthomas try it out just to make sure it doesn't break something do to bad xml formatting?

@luongthomas
Copy link
Collaborator

I'll give it a look

@luongthomas luongthomas self-assigned this Feb 4, 2019
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@MatiasMFM2001
Copy link
Contributor Author

MatiasMFM2001 commented Feb 12, 2019

I've solved app/src/main/res/values/strings.xml was a conflicting file in my forked repo. Are there new lines to translate? I've noticed your English strings.txt has 188 lines, while mine had 182 lines.

@luongthomas
Copy link
Collaborator

luongthomas commented Feb 14, 2019

I've solved app/src/main/res/values/strings.xml was a conflicting file in my forked repo. Are there new lines to translate? I've noticed your English strings.txt has 188 lines, while mine had 182 lines.

Yes, we've added a couple of new lines since our last release. If you have trouble getting your project in sync with the latest version, join us on our slack channel. I can lend a hand with that if we're both online

@corbinlc
Copy link
Member

We could always accept what he has done, as long as he has fixed the formatting issues you mentioned. Then he can make another PR later with the additional strings when he wants.

@luongthomas luongthomas merged commit f831df3 into CypherpunkArmory:master Feb 20, 2019
MatthewTighe pushed a commit that referenced this pull request Aug 14, 2019
* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml

* Update strings.xml
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.

3 participants