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.

Sign up for GitHub

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

Jump to bottom

Add translation about/governance in Spanish #1945

Merged
10 commits merged into from
Feb 14, 2019
Merged

Add translation about/governance in Spanish #1945

10 commits merged into from
Feb 14, 2019

Conversation

Beor18
Copy link
Contributor

@Beor18 Beor18 commented Dec 18, 2018

Hello community,

I bring you another contribution in the Spanish translation

Thank you very much and I hope for comments.

Best regards

@fhemberger
Copy link
Contributor

@Beor18 Hi, thanks for the update. Could you please rebase your changes from master and fix the merge conflicts?

/cc @nodejs/nodejs-es Please review.

@Beor18
Copy link
Contributor Author

Beor18 commented Dec 19, 2018

@Beor18 Hi, thanks for the update. Could you please rebase your changes from master and fix the merge conflicts?

/cc @nodejs/nodejs-es Please review.

Hello @fhemberger, have now if it's okay.
Excuse me as I am new contributing by there I can make some mistake and it's good to let me know jajaja

Best regards!

@ghost
Copy link

ghost commented Feb 3, 2019

@nodejs/nodejs-es：Sorry but it's been a long time, anyone free can have a review of that so as to merge it quickly :)

taggon and others added 2 commits February 3, 2019 17:59
@taggon
Korean translation for package-manager.md (nodejs#1979)
f0c1874 
This PR fixes some missing Korean translations in nodejs#1832.
Ref：nodejs/nodejs-ko#763
Chore: Fix anchor links and update translations (nodejs#2029)
582a01f 
Because of the missing submission, we have to re-submit them together.

Ref 1: nodejs#2028,
Ref 2: nodejs#2026.
@edsadr edsadr self-assigned this Feb 5, 2019
edsadr
edsadr requested changes Feb 5, 2019
View reviewed changes
locale/es/about/governance.md Outdated Show resolved Hide resolved
SofiEstevez and others added 5 commits February 6, 2019 10:28
@SofiEstevez @ZYSzys
Update node-meetups.md (nodejs#2005)
2fd6d1a 
* Update node-meetups.md

* Update locale/en/get-involved/node-meetups.md

Thanks for reviewing, will update :)

Co-Authored-By: SofiEstevez <[email protected]>

* Corrected some formatting :)

* Update node-meetups.md

* Update node-meetups.md

* Update node-meetups.md

* Update locale/en/get-involved/node-meetups.md

Co-Authored-By: SofiEstevez <[email protected]>

* Update locale/en/get-involved/node-meetups.md

Sure, thank you for helping me formatting this!

Co-Authored-By: SofiEstevez <[email protected]>
@lirantal @fhemberger
fix(speakers): update to the correctly written form of Node.js (nodej…
9da816b 
…s#2032)
@Beor18
Add translation about/governance in Spanish
eda8b34
@Beor18
cambio en traduccion
c281bda
@Beor18
Merge branch 'master' of https://github.com/Beor18/nodejs.org
4c4dce4 
Conflicts:
	locale/es/about/governance.md
@ghost
Copy link

ghost commented Feb 10, 2019 •
edited by ghost
Loading

@Beor18：Hi,

Since your changes should be limited to 'about/governance', so for other changes you don't need to submit. You can only submit what changes you have :)

Suggestions:

  1. Save your changes into 'Stash' first.
  2. You can just use git pull --rebase origin master to update your own master branch when it's checked out.
  3. Solve all kinds of conflicts...ect.
  4. Apply the changes from your Slash of Git into the current master, and make a force push.

Hope this helps!

@ghost ghost merged commit f63e81b into nodejs:master Feb 14, 2019
@ghost
Copy link

ghost commented Feb 14, 2019

@Beor18：Thank you!

@snyk-bot snyk-bot mentioned this pull request Mar 20, 2021
Open
@snyk-bot snyk-bot mentioned this pull request May 18, 2023
Open
@snyk-bot snyk-bot mentioned this pull request Jun 1, 2023
Open
@jydmyk jydmyk mentioned this pull request Jun 5, 2023
Open
This was referenced Jun 29, 2023
Open
Open
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@academo academo academo left review comments

@edsadr edsadr edsadr approved these changes

@vrunoa vrunoa vrunoa approved these changes

Assignees

@edsadr edsadr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Beor18 @fhemberger @academo @vrunoa @edsadr @taggon @SofiEstevez @lirantal