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

not merge #2

Closed
wants to merge 91 commits into
from

Conversation

Projects
None yet
2 participants
@JesusZapata
Collaborator

JesusZapata commented May 23, 2017

No description provided.

JesusZapata and others added some commits Mar 29, 2017

Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (85 of 85 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/

JesusZapata and others added some commits Apr 7, 2017

Translated using Weblate (Spanish)
Currently translated at 100.0% (95 of 95 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (95 of 95 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
Translated using Weblate (Spanish)
Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
[REF] i18n: Conflict on the daily cron
On branch master
Your branch is up-to-date with 'origin/master'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   openacademy/i18n/es.po

no changes added to commit (use "git add" and/or "git commit -a")
[REF] i18n: Conflict on the daily cron (#8)
* Translated using Weblate (Spanish)

Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/

* Fix conflict
Translated using Weblate (Spanish)
Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
[REF] i18n: Conflict on the daily cron
On branch master
Your branch is up-to-date with 'origin/master'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   openacademy/i18n/es.po

no changes added to commit (use "git add" and/or "git commit -a")
[REF] i18n: Conflict on the daily cron (#9)
* Translated using Weblate (Spanish)

Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/

* Fix conflict
Translated using Weblate (Spanish)
Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/
[REF] i18n: Conflict on the daily cron
On branch master
Your branch is up-to-date with 'origin/master'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   openacademy/i18n/es.po

no changes added to commit (use "git add" and/or "git commit -a")
[REF] i18n: Conflict on the daily cron (#10)
* Translated using Weblate (Spanish)

Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/

* Fix conflict
[REF] i18n: Conflict on the daily cron (#12)
* Translated using Weblate (Spanish)

Currently translated at 100.0% (96 of 96 strings)

Translation: openacademy-project/openacademy-project
Translate-URL: http://example.com/projects/openacademy-project/openacademy-project/es/

* Fix conflict

@JesusZapata JesusZapata deleted the JesusZapata:master-vx branch May 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment