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

Already on GitHub? Sign in to your account

Feature installfest translations #316

Closed
wants to merge 279 commits into
from

Conversation

Projects
None yet

No description provided.

enelesmai and others added some commits Oct 22, 2013

@enelesmai enelesmai [#58485014] Frontend > Resources.step fix 71e8d76
Erika Mejia [#58728096] Ruby file translation 78a3ae2
Erika Mejia Merge branch 'master' into docs 44f1045
Erika Mejia [#58728096] Add accents in some words a3c9ddf
Erika Mejia [#58727872] Add some changes from the original repo 1e94d8f
Erika Mejia [#58728178] what is ruby translation ad3b092
Erika Mejia [#58728178] use new method 81cbcf3
Erika Mejia new methods 0d1236e
Erika Mejia [#58728178] fix typo 6325752
Erika Mejia fix typo 24a843b
sixviv Add some acents d3fc7a6
@erinmejiaa erinmejiaa Merge pull request #17 from codificadas/new-link-methods
new methods
82b440c
@sixviv sixviv [#59007208] Tradiccion de OSX Panther 65cbba9
Erika Mejia [#58728178] fix typos and change wikipedia spanish link 42e181f
Erika Mejia Merge branch 'master' into what-is-ruby e17af04
Erika Mejia [#58728178] Use a separate style for spanish version 4739b5d
Alejandra Cernas Comentarios corregidos del pull request #9 282249c
Alejandra Cernas Acentos corregidos 707aecc
aromaron Initial commit
- Create Workshop Folders and Files
ab5b9c6
aromaron Merge branch 'master' into section_workshop fe99b87
Nora Gabriela Alvarado Mora Merge pull request #20 from codificadas/section_workshop
Section workshop
f4c5e94
@sixviv sixviv Adjusting to work with spanish next_page method 6aebc9c
Erika Mejia [#58727872] Add missing accent 1df10e6
@sixviv sixviv Remove puts b2cf128
Erika Mejia Merge branch 'master' into docs dacbbe2
Erika Mejia [#58728096] Add missing accent 5ad86e2
Erika Mejia Merge branch 'master' into ruby f204428
Erika Mejia [#58728178] change name of the file 075ade1
Erika Mejia Merge branch 'master' into what-is-ruby 81d6d06
Erika Mejia [#58727872] changes related to the comments a0f81ab
@erinmejiaa erinmejiaa Merge pull request #6 from codificadas/docs
[#58727872] traduccion del archivo docs
3136f03
@erinmejiaa erinmejiaa Merge pull request #18 from codificadas/what-is-ruby
What is ruby
7f1fc3d
@anymoto anymoto Merge pull request #15 from codificadas/resources
[#58485014] Frontend > Resources.step fix
0e90536
sixviv Merge pull request #21 from codificadas/es-sub-links
Es sub links
4cd49a9
Erika Mejia [#58728096] changes related to the comments 1787bcc
Erika Mejia Merge branch 'master' into ruby 8b9099d
sixviv Merge pull request #16 from codificadas/ruby
[#58728096] Ruby file translation
89b04c2
Erika Mejia [#58728096] change link c28837f
@erinmejiaa erinmejiaa Merge pull request #22 from codificadas/ruby
[#58728096] change link
dcc9081
Erika Mejia methods 42fce21
Erika Mejia Merge branch 'master' into new-link-methods f16b532
@erinmejiaa erinmejiaa Merge pull request #23 from codificadas/new-link-methods
New link methods
6ce5c0d
Erika Mejia change name of methods dc5007b
@erinmejiaa erinmejiaa Merge pull request #24 from codificadas/new-link-methods
change name of methods
1698b35
@sixviv sixviv Change to work with new spanish methods c7991e5
Erika Mejia [#58728096] use new method name 3179e56
@erinmejiaa erinmejiaa Merge pull request #25 from codificadas/ruby
[#58728096] use new method name
cea3e6b
Erika Mejia [#58728178] use new methods name f105102
@erinmejiaa erinmejiaa Merge pull request #26 from codificadas/what-is-ruby
[#58728178] use new methods name
8382913
@sixviv sixviv Remove for 'spanish_link' method 52adb2d
@sixviv sixviv Change some link to 'next_spanish_step' method 06b3f65
@sixviv sixviv Change to work with both 'next_step' 96f9859
Erika Mejia [#58728202] command line translation a4ef62f
Erika Mejia Merge branch 'master' into command-line a11a63e
Erika Mejia [#58728178] remove unnecesary alias 0434c59
Erika Mejia Merge branch 'master' into what-is-ruby 2e9ee60
@erinmejiaa erinmejiaa Merge pull request #28 from codificadas/what-is-ruby
What is ruby
1038173
Erika Mejia Merge branch 'master' into command-line 7cf101a
Erika Mejia [#58728202] use goal instead of meta c15dbdd
Erika Mejia New method spanish_irb d6b3837

sixviv and others added some commits Jan 30, 2014

@sixviv sixviv Change female word 4d2a58d
@sixviv sixviv Grammar corrections 0ca8de9
@anymoto anymoto Add localization 2fb16b4
@anymoto anymoto Remove spanish methods
        * They're not used anymore because of i18n implementation
67f15fd
@anymoto anymoto Merge branch 'original-repo' into configure-i18n
Conflicts:
	Gemfile
	Gemfile.lock
	lib/contents.rb
	lib/step.rb
	sites/es/installfest/crea_una_cuenta_de_heroku.step
	spec/step_page_spec.rb
	spec/step_spec.rb
427c28c
@anymoto anymoto Fix unnecessary translation e7396f6
@anymoto anymoto Add i18n and pry gems d472283
@anymoto anymoto Add missing translations after merge db262c5
@anymoto anymoto Restore language for resurces, eng version edc3e06
@anymoto anymoto Merge branch 'master' into resources 091b295
@anymoto anymoto Merge pull request #51 from codificadas/resources
resources -es #58485014
7d76ac4
@anymoto anymoto Merge branch 'master' into javascript_basico
Conflicts:
	lib/step.rb
ece6a64
@anymoto anymoto Fix translations f043aeb
@anymoto anymoto Fix translations according to PR comments fb2fecf
@anymoto anymoto Merge pull request #53 from codificadas/javascript_basico
Javascript Basico #58484974
dc3f6ab
@anymoto anymoto Merge branch 'master' into mh_installfest_windows
Conflicts:
	sites/es/installfest/windows.step
ea5af1d
@anymoto anymoto Remove spanish method 0585da1
Erika Mejia Fix merge conflict d413f7f
@anymoto anymoto Fix translation b4d77a5
@anymoto anymoto Merge pull request #72 from codificadas/mh_installfest_windows
Mh installfest windows
0dffbcf
@anymoto anymoto Merge branch 'master' into make-columns
Conflicts:
	sites/es/frontend/hacer_columnas.step
3e914be
@anymoto anymoto Merge branch 'make-columns' of github.com:codificadas/docs into make-…
…columns

Conflicts:
	Gemfile
	Gemfile.lock
	app.rb
	lib/contents.rb
	lib/step.rb
	spec/step_page_spec.rb
	spec/step_spec.rb
3d1cb2d
@anymoto anymoto Merge pull request #8 from codificadas/make-columns
[#58484932]Seccion make columns terminada
4ad306e
@anymoto anymoto Merge branch 'master' into add-starter-files
Conflicts:
	Gemfile
	Gemfile.lock
	app.rb
	lib/contents.rb
	lib/step.rb
	spec/step_page_spec.rb
	spec/step_spec.rb
be34733
@anymoto anymoto Fix translation 74e3b8b
@anymoto anymoto Merge pull request #10 from codificadas/add-starter-files
[#58484738] Seccion add-starter-files terminada
8b25071
@anymoto anymoto Merge branch 'add-more-elements' of github.com:codificadas/docs into …
…add-more-elements
638305a
@anymoto anymoto Merge branch 'master' into add-more-elements e5002c6
@anymoto anymoto Fix translation d25162c
@anymoto anymoto Add missing translations and locales 3028da9
@anymoto anymoto Fix translation 96ba0ca
@anymoto anymoto Merge pull request #19 from codificadas/add-more-elements
Add more elements
6f4951e
@anymoto anymoto Merge branch 'master' into Strings
Conflicts:
	lib/step.rb
a07e7a8
@anymoto anymoto Fix translation 7ae6d5c
@anymoto anymoto Merge pull request #32 from codificadas/Strings
[#58728294] traduccion del archivo strings
d4ac275
@anymoto anymoto Merge branch 'master' into temas 5901ae0
@anymoto anymoto Fix translations and file path d34f8b0
@anymoto anymoto Merge pull request #43 from codificadas/temas
[#59706244] traduciendo el modulo de temas
82ad2aa
@anymoto anymoto Merge branch 'master' into mh_clean_up 0b28b2c
@anymoto anymoto Fix translation fb73c41
@anymoto anymoto Merge pull request #67 from codificadas/mh_clean_up
Translate Installfest/Cleanup to Spanish
bbbd77c
@sixviv @anymoto sixviv + anymoto [#59007208] Tradiccion de OSX Panther 17af536
@sixviv @anymoto sixviv + anymoto Some grammar corrections 59efb16
@sixviv @anymoto sixviv + anymoto Fixing grammar errors 87d9877
@sixviv @anymoto sixviv + anymoto Grammar corrections e0dd02b
@anymoto anymoto Fix translation f945b95
@anymoto anymoto Merge branch 'osx-panther' of github.com:codificadas/docs into osx-pa…
…nther

Conflicts:
	sites/es/installfest/osx_panther.step
d62c66c
@anymoto anymoto Merge pull request #68 from codificadas/osx-panther
OSX Panther traduction
a9e7ecc
@sixviv @anymoto sixviv + anymoto WIP fe05391
@sixviv @anymoto sixviv + anymoto Install rvm and ruby traduction b3d6e0b
@sixviv @anymoto sixviv + anymoto Fixing grammar errors 47a4027
@sixviv @anymoto sixviv + anymoto Grammar corrections db3fd85
@anymoto anymoto Split instructions step into two, and update contents according to or…
…iginal repo
b447d58
@anymoto anymoto Merge branch 'install-rvm' of github.com:codificadas/docs into instal…
…l-rvm

Conflicts:
	sites/es/installfest/instala_rvm_y_ruby.step
eeab7cc
@anymoto anymoto Merge pull request #69 from codificadas/install-rvm
Install rvm traduction
b62942c
@chischaschos chischaschos Translate step, not sure if I should also translate file names 5557d4e
Owner

tjgrathwell commented Feb 13, 2014

Can you squash this down to one (or a few) commits? @alexch and I may disagree on this, but I think adding in this merge-heavy, wip-heavy history is going to be really confusing.

More importantly, it doesn't look like this takes into account @alexch's latest changes for locale support from #313, so it doesn't merge cleanly right now.

Owner

alexch commented Feb 13, 2014

I think this was meant to be a PR for codificadas/docs, not railsbridge/docs

(the master of codificadas is in sync with railsbridge/docs/master)

On Thu, Feb 13, 2014 at 12:55 PM, Travis Grathwell <notifications@github.com

wrote:

Can you squash this down to one (or a few) commits? @alexchhttps://github.com/alexchand I may disagree on this, but I think adding in this merge-heavy,
wip-heavy history is going to be really confusing.

More importantly, it doesn't look like this takes into account @alexchhttps://github.com/alexch's
latest changes for locale support from #313#313,
so it doesn't merge cleanly right now.

Reply to this email directly or view it on GitHubhttps://github.com/railsbridge/docs/pull/316#issuecomment-35005931
.

Alex Chaffee - alex@stinky.com
http://alexchaffee.com
http://twitter.com/alexch

Ouch my bad, sorry, it was for codificadas/docs. Gonna close this.

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