Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Feature installfest translations #316

Closed
wants to merge 279 commits into from
@chischaschos

No description provided.

enelesmai and others added some commits
@enelesmai enelesmai [#58485014] Frontend > Resources.step fix 71e8d76
@erinmejiaa erinmejiaa [#58728096] Ruby file translation 78a3ae2
@erinmejiaa erinmejiaa Merge branch 'master' into docs 44f1045
@erinmejiaa erinmejiaa [#58728096] Add accents in some words a3c9ddf
@erinmejiaa erinmejiaa [#58727872] Add some changes from the original repo 1e94d8f
@erinmejiaa erinmejiaa [#58728178] what is ruby translation ad3b092
@erinmejiaa erinmejiaa [#58728178] use new method 81cbcf3
@erinmejiaa erinmejiaa new methods 0d1236e
@erinmejiaa erinmejiaa [#58728178] fix typo 6325752
@erinmejiaa erinmejiaa fix typo 24a843b
@sixviv 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
@erinmejiaa erinmejiaa [#58728178] fix typos and change wikipedia spanish link 42e181f
@erinmejiaa erinmejiaa Merge branch 'master' into what-is-ruby e17af04
@erinmejiaa erinmejiaa [#58728178] Use a separate style for spanish version 4739b5d
Alejandra Cernas Comentarios corregidos del pull request #9 282249c
Alejandra Cernas Acentos corregidos 707aecc
@aromaron aromaron Initial commit
- Create Workshop Folders and Files
ab5b9c6
@aromaron aromaron Merge branch 'master' into section_workshop fe99b87
@aromaron aromaron Merge pull request #20 from codificadas/section_workshop
Section workshop
f4c5e94
@sixviv sixviv Adjusting to work with spanish next_page method 6aebc9c
@erinmejiaa erinmejiaa [#58727872] Add missing accent 1df10e6
@sixviv sixviv Remove puts b2cf128
@erinmejiaa erinmejiaa Merge branch 'master' into docs dacbbe2
@erinmejiaa erinmejiaa [#58728096] Add missing accent 5ad86e2
@erinmejiaa erinmejiaa Merge branch 'master' into ruby f204428
@erinmejiaa erinmejiaa [#58728178] change name of the file 075ade1
@erinmejiaa erinmejiaa Merge branch 'master' into what-is-ruby 81d6d06
@erinmejiaa erinmejiaa [#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 sixviv Merge pull request #21 from codificadas/es-sub-links
Es sub links
4cd49a9
@erinmejiaa erinmejiaa [#58728096] changes related to the comments 1787bcc
@erinmejiaa erinmejiaa Merge branch 'master' into ruby 8b9099d
@sixviv sixviv Merge pull request #16 from codificadas/ruby
[#58728096] Ruby file translation
89b04c2
@erinmejiaa erinmejiaa [#58728096] change link c28837f
@erinmejiaa erinmejiaa Merge pull request #22 from codificadas/ruby
[#58728096] change link
dcc9081
@erinmejiaa erinmejiaa methods 42fce21
@erinmejiaa erinmejiaa Merge branch 'master' into new-link-methods f16b532
@erinmejiaa erinmejiaa Merge pull request #23 from codificadas/new-link-methods
New link methods
6ce5c0d
@erinmejiaa erinmejiaa 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
@erinmejiaa erinmejiaa [#58728096] use new method name 3179e56
@erinmejiaa erinmejiaa Merge pull request #25 from codificadas/ruby
[#58728096] use new method name
cea3e6b
@erinmejiaa erinmejiaa [#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
@erinmejiaa erinmejiaa [#58728202] command line translation a4ef62f
@erinmejiaa erinmejiaa Merge branch 'master' into command-line a11a63e
@erinmejiaa erinmejiaa [#58728178] remove unnecesary alias 0434c59
@erinmejiaa erinmejiaa Merge branch 'master' into what-is-ruby 2e9ee60
@erinmejiaa erinmejiaa Merge pull request #28 from codificadas/what-is-ruby
What is ruby
1038173
@erinmejiaa erinmejiaa Merge branch 'master' into command-line 7cf101a
@erinmejiaa erinmejiaa [#58728202] use goal instead of meta c15dbdd
@erinmejiaa erinmejiaa New method spanish_irb d6b3837
@erinmejiaa erinmejiaa [#58728258] translation of variables file f78b0f0
@erinmejiaa erinmejiaa Merge pull request #29 from codificadas/new-link-methods
New method spanish_irb
979b58e
@erinmejiaa erinmejiaa Merge branch 'master' into variables 7a1a6a3
@erinmejiaa erinmejiaa [#58728258] typo 8582ed8
@erinmejiaa erinmejiaa Merge branch 'master' into command-line 72fc818
@erinmejiaa erinmejiaa [#58728202] fix typos 62f2301
@sixviv sixviv Change regular expresion to work with spanish methods db31eab
@sixviv sixviv Fixing git problems f07acfd
@sixviv sixviv Merge branch 'installfest-traduccion' into change-links
* installfest-traduccion:
  Fixing git problems
  Change regular expresion to work with spanish methods
  New method spanish_irb
  [#58728178] remove unnecesary alias
  Change to work with both 'next_step'
947bd4f
@erinmejiaa erinmejiaa [#58728258] change indentation 7ea94f4
@sixviv sixviv Edit some links to have tree files correct 2d5029e
@sixviv sixviv Remove puts c0fd76d
@sixviv sixviv Merge branch 'installfest-traduccion' into install-textmate
* installfest-traduccion: (35 commits)
  Remove puts
  Fixing git problems
  Change regular expresion to work with spanish methods
  New method spanish_irb
  [#58728178] remove unnecesary alias
  Change to work with both 'next_step'
  Remove for 'spanish_link' method
  [#58728178] use new methods name
  [#58728096] use new method name
  Change to work with new spanish methods
  change name of methods
  methods
  [#58728096] change link
  [#58728096] changes related to the comments
  [#58727872] changes related to the comments
  [#58728178] change name of the file
  [#58728096] Add missing accent
  Remove puts
  [#58727872] Add missing accent
  Adjusting to work with spanish next_page method
  ...
1d9afb2
@AryMG AryMG [#58728294] traduccion del archivo strings 60c827e
@sixviv sixviv Merge branch 'install-textmate' of github.com:codificadas/docs into i…
…nstall-textmate

* 'install-textmate' of github.com:codificadas/docs:
  Add some acents
21b3630
@sixviv sixviv Grammar corrections bf3f4b1
@sixviv sixviv Merge pull request #31 from codificadas/change-links
Change links
e1fae61
@sixviv sixviv WIP 418c7d8
@sixviv sixviv Change a link for spanish version 377c9bc
@sixviv sixviv Merge pull request #14 from codificadas/install-textmate
Install textmate
21951b5
@sixviv sixviv Merge branch 'installfest-traduccion' into install-rvm
* installfest-traduccion:
  Change a link for spanish version
3ce2930
@aromaron aromaron [#59706350] traduccion de la pagina de welcome blah 5e363e0
@erinmejiaa erinmejiaa [#58728178] change file name f103a77
@erinmejiaa erinmejiaa Merge pull request #34 from codificadas/what-is-ruby
[#58728178] change file name
62d864c
@erinmejiaa erinmejiaa Delete qué_es_ruby.step e5c59fc
@erinmejiaa erinmejiaa [#58728178] change file name and link 2f6f691
@erinmejiaa erinmejiaa Merge pull request #35 from codificadas/what-is-ruby
[#58728178] change file name and link
d2c4467
@sixviv sixviv Install rvm and ruby traduction 4c79f37
@sixviv sixviv Merge and resolve confilcts c3ba5de
@sixviv sixviv Some grammar corrections a02c8a1
@erinmejiaa erinmejiaa Merge branch 'master' into command-line c335d85
@erinmejiaa erinmejiaa [#58728202] rename file and add some changes 8b3f256
@erinmejiaa erinmejiaa Merge branch 'master' into variables d5247de
@erinmejiaa erinmejiaa [#58728258] add some changes from the comments f1fc3f0
@erinmejiaa erinmejiaa [#58728300] arrays file translation 0c46252
@erinmejiaa erinmejiaa spanish_step new method 35a0cae
@erinmejiaa erinmejiaa [#58728338] loops file translation 46a6de9
@erinmejiaa erinmejiaa spanish_type_in_file new method 310036d
@erinmejiaa erinmejiaa [#58728362] running programs from a file translation 93160c4
@erinmejiaa erinmejiaa [#58728362] fix comments c4ec7fb
@oyuki oyuki [#59706244] traduciendo el modulo de temas defafd4
@erinmejiaa erinmejiaa Change word in the spanish_goals method cd9e8fc
@erinmejiaa erinmejiaa Merge pull request #39 from codificadas/new-link-methods
spanish_result new method
ce55bfd
@erinmejiaa erinmejiaa Merge branch 'master' into loops 16247e2
@erinmejiaa erinmejiaa [#58728338] Fix comments in pull request b13b510
@erinmejiaa erinmejiaa Merge pull request #27 from codificadas/command-line
[#58728202] command line translation
64ca374
@aromaron aromaron Change workshop dirctory por taller
- Note: taller.md is WIP
265598e
@aromaron aromaron Use proper file names 108027a
@aromaron aromaron Merge pull request #44 from codificadas/translate_welcome
Translate welcome
6eb4cd8
@erinmejiaa erinmejiaa [#58728300] add question marks 2d1dc85
@erinmejiaa erinmejiaa Merge branch 'master' into arrays b9937ae
@erinmejiaa erinmejiaa Merge pull request #30 from codificadas/variables
[#58728258] translation of variables file
47bb739
@erinmejiaa erinmejiaa Merge pull request #40 from codificadas/loops
[#58728338] loops file translation
5148204
@erinmejiaa erinmejiaa Merge pull request #41 from codificadas/running-programs
[#58728362] running programs from a file translation
7c1a1ea
@erinmejiaa erinmejiaa Merge pull request #38 from codificadas/arrays
[#58728300] arrays file translation
3e92c18
@erinmejiaa erinmejiaa [#58727872] use facilitadores instead of maestros 57dc1a3
@erinmejiaa erinmejiaa [#58728096] Add some accents and use objetivo instead of meta 93b3d69
@erinmejiaa erinmejiaa [#58728178] remove an extra p 2e24787
@erinmejiaa erinmejiaa [#58728300] Add missing accent 0eae6ca
@erinmejiaa erinmejiaa Merge pull request #45 from codificadas/docs
[#58727872] use facilitadores instead of maestros
e07bdcb
@erinmejiaa erinmejiaa Merge pull request #46 from codificadas/ruby
[#58728096] Add some accents and use objetivo instead of meta
ad3a1a5
@erinmejiaa erinmejiaa Merge pull request #47 from codificadas/what-is-ruby
[#58728178] remove an extra p
6a491f1
@erinmejiaa erinmejiaa Merge pull request #48 from codificadas/arrays
[#58728300] Add missing accent
c5aae24
@erinmejiaa erinmejiaa [#58727872] remove extra accents 9dc2ad0
@erinmejiaa erinmejiaa Merge pull request #50 from codificadas/docs
[#58727872] remove extra accents
633eb5b
@enelesmai enelesmai resources -es #58485014 4dd6a51
@enelesmai enelesmai Javascript Basico #58484974 17a8c17
@oyuki oyuki merge master 661f6c6
@oyuki oyuki cambio archvo estado origen d5aab43
@marianahj marianahj Translate Installfest/Windows to Spanish de4b6d8
@sixviv sixviv Merge branch 'master' into installfest-traduccion
* master: (28 commits)
  [#58727872] remove extra accents
  [#58728300] Add missing accent
  [#58728178] remove an extra p
  [#58728096] Add some accents and use objetivo instead of meta
  [#58727872] use facilitadores instead of maestros
  [#58728300] add question marks
  Use proper file names
  Change workshop dirctory por taller
  [#58728338] Fix comments in pull request
  Change word in the spanish_goals method
  [#58728362] fix comments
  [#58728362] running programs from a file translation
  spanish_type_in_file new method
  [#58728338] loops file translation
  spanish_step new method
  [#58728300] arrays file translation
  [#58728258] add some changes from the comments
  [#58728202] rename file and add some changes
  [#58728178] change file name and link
  Delete qué_es_ruby.step
  ...
a7b8ae6
@erinmejiaa erinmejiaa [#58727872] add exclamation mark fc78d7a
@marianahj marianahj Translate Installfest/Cleanup to Spanish ac63895
@erinmejiaa erinmejiaa Merge pull request #66 from codificadas/docs
[#58727872] add exclamation mark
6509769
@sixviv sixviv Fixing names ffc8751
@sixviv sixviv Change deploy word for a real spanish word f03d247
@sixviv sixviv Change a better word for 'deploy' cc3be23
@sixviv sixviv Merge pull request #65 from codificadas/installfest-traduccion
Installfest traduccion
9b7aadf
@sixviv sixviv Fixing grammar errors 8e065fd
@sixviv sixviv Merge branch 'master' into osx-panther
* master: (32 commits)
  Change a better word for 'deploy'
  Change deploy word for a real spanish word
  Fixing names
  [#58727872] add exclamation mark
  [#58727872] remove extra accents
  [#58728300] Add missing accent
  [#58728178] remove an extra p
  [#58728096] Add some accents and use objetivo instead of meta
  [#58727872] use facilitadores instead of maestros
  [#58728300] add question marks
  Use proper file names
  Change workshop dirctory por taller
  [#58728338] Fix comments in pull request
  Change word in the spanish_goals method
  [#58728362] fix comments
  [#58728362] running programs from a file translation
  spanish_type_in_file new method
  [#58728338] loops file translation
  spanish_step new method
  [#58728300] arrays file translation
  ...
86c0ec2
@sixviv sixviv Fixing grammar errors 6f2def8
@sixviv sixviv Merge branch 'master' into install-rvm
* master: (32 commits)
  Change a better word for 'deploy'
  Change deploy word for a real spanish word
  Fixing names
  [#58727872] add exclamation mark
  [#58727872] remove extra accents
  [#58728300] Add missing accent
  [#58728178] remove an extra p
  [#58728096] Add some accents and use objetivo instead of meta
  [#58727872] use facilitadores instead of maestros
  [#58728300] add question marks
  Use proper file names
  Change workshop dirctory por taller
  [#58728338] Fix comments in pull request
  Change word in the spanish_goals method
  [#58728362] fix comments
  [#58728362] running programs from a file translation
  spanish_type_in_file new method
  [#58728338] loops file translation
  spanish_step new method
  [#58728300] arrays file translation
  ...
30041e7
@erinmejiaa erinmejiaa [#58727872] use RailsBridge instead of Railsbridge, add some missing …
…accents
5c6b254
@erinmejiaa erinmejiaa Merge branch 'master' into docs aec5332
@sixviv sixviv Grammar corrections a0f0e8b
@sixviv sixviv Grammar corrections c8aa83f
@marianahj marianahj Replacing words 0f5ffe3
@marianahj marianahj Translate Installfest/Crea una cuenta de heroku to Spanish db18f20
@sixviv sixviv Merge branch 'mh_create_heroku_account' of github.com:codificadas/doc…
…s into mh_create_heroku_account

* 'mh_create_heroku_account' of github.com:codificadas/docs:
  Translate Installfest/Crea una cuenta de heroku to Spanish

Conflicts:
	sites/es/installfest/crea_una_cuenta_de_heroku.step
53c1aa9
@marianahj marianahj Fix typos and grammar errors 42c2093
@marianahj marianahj Fix more typos 0cc45df
@marianahj marianahj Use English word instead of literal translation d6072a2
@ana-ci ana-ci Merge branch 'make-columns' of github.com:codificadas/docs into make-…
…columns
93917a3
@ana-ci ana-ci WIP I18n config 84b417b
Matt Yoho and Rachel Myers Move the translate step to inside define_method f4adc42
@anymoto anymoto [#58484932] Translate Make Columns section 481a13d
@anymoto anymoto Merge branch 'resources' of github.com:codificadas/docs into resources 55b3160
@anymoto anymoto Fix link title and typo 7e02b92
@anymoto anymoto Merge branch 'add-more-elements' of github.com:codificadas/docs into …
…add-more-elements
2c6e4f7
@anymoto anymoto Merge master into branch bc9f561
@aromaron aromaron Fix some typos cedfdcd
@aromaron aromaron Fix typos and rewrite some sentences d231b60
@sixviv sixviv Merge pull request #74 from codificadas/mh_create_heroku_account
Translate Installfest/Crea una cuenta de heroku to Spanish
f76be74
@aromaron aromaron [#63725240] Fix typos marked in PR comments 99a3217
@aromaron aromaron Merge branch 'master' into add-starter-files bf033ae
@anymoto anymoto Merge remote-tracking branch 'upstream/master' into original-repo
Conflicts:
	Gemfile.lock
	README.md
	app.rb
	lib/contents.rb
	lib/doc_page.rb
	lib/step.rb
	public/css/doc_page.css
	public/css/toc.scss
	public/js/doc_page.js
	sites/curriculum/allow_people_to_vote.step
	sites/docs/docs.step
	sites/installfest/_switch_to_home_directory.step
	sites/installfest/create_and_deploy_a_rails_app.step
	sites/installfest/get_a_sticker.step
	sites/javascript/javascript.step
	sites/javascript/javascript_not_java.step
	spec/step_spec.rb
20764f0
hckmar9 Traduccion de links de la pagina principal 65a5d26
@sixviv sixviv Merge pull request #80 from codificadas/traduccion-links-homepage
Traduccion de links de la pagina principal
7504c5c
@anymoto anymoto Merge branch 'master' into original-repo 6aa7a9e
@alexch alexch bundle update; fix failing deck.js test 3723646
@tjgrathwell tjgrathwell Remove bourbon
It was only used for a single "@include border-radius" line which is no longer present
a329e44
@alexch alexch fix 'es' subdomain with default site b61b829
@alexch alexch Merge commit 'aec5332' into codificadas 46ed474
@anymoto anymoto Merge pull request #81 from alexch/codificadas
fix 'es' subdomain with default site
a58e27e
@anymoto anymoto Add missing accent 8fa0a74
@anymoto anymoto Merge branch 'make-columns' of github.com:codificadas/docs into make-…
…columns

Conflicts:
	sites/es/frontend/hacer_columnas.step
2422369
@anymoto anymoto Merge branch 'master' into make-columns 1a34278
@anymoto anymoto Merge branch 'master' into original-repo
Conflicts:
	Gemfile.lock
	app.rb
	spec/app_spec.rb
c306179
@anymoto anymoto Fix spanish routes, temporarily cd2e7b7
@anymoto anymoto Add pry gem b4ae078
@anymoto anymoto Rename curriculum to intro-to-rails 9e15637
@anymoto anymoto Fix failing spec, curriculum does not exist anymore 0636cb0
@anymoto anymoto Rename curriculm step to intro-to-rails d50b530
@sixviv sixviv Merge branch 'add-more-elements' of github.com:codificadas/docs into …
…add-more-elements

* 'add-more-elements' of github.com:codificadas/docs:
  Acentos corregidos
  Comentarios corregidos del pull request #9
  [#58484754]Seccion add-more-elements terminada
  [#58484754]Seccion add-more-elements terminada
e91c698
@sixviv sixviv Grammar corrections 1a6e94d
@sixviv sixviv Resolve conflicts c2b4369
@sixviv sixviv Merge branch 'make-columns' of github.com:codificadas/docs into make-…
…columns

* 'make-columns' of github.com:codificadas/docs:
  Add missing accent
  Fix typos and rewrite some sentences
  [#58484932] Translate Make Columns section
  [#58484932]Seccion make columns terminada
40311af
@sixviv sixviv Grammar Corrections 38abe8a
@sixviv sixviv Merge branch 'master' into add-more-elements
* master:
  fix 'es' subdomain with default site
  Remove bourbon
  bundle update; fix failing deck.js test
  Traduccion de links de la pagina principal
  [#58727872] use RailsBridge instead of Railsbridge, add some missing accents
f92fb4e
@sixviv sixviv Merge branch 'add-starter-files' of github.com:codificadas/docs into …
…add-starter-files

* 'add-starter-files' of github.com:codificadas/docs:
  [#63725240] Fix typos marked in PR comments
  [#58484738] Seccion add-starter-files terminada
bc14bb6
@sixviv sixviv Rename file 85f73cb
@sixviv sixviv Merge branch 'Strings' of github.com:codificadas/docs into Strings
* 'Strings' of github.com:codificadas/docs:
  [#58728294] traduccion del archivo strings
aa73e9a
@sixviv sixviv Grammar Corrections 7249cb2
@sixviv sixviv Merge branch 'temas' of github.com:codificadas/docs into temas
* 'temas' of github.com:codificadas/docs:
  cambio archvo estado origen
  [#59706244] traduciendo el modulo de temas
45152ac
@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
@erinmejiaa erinmejiaa 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 sixviv [#59007208] Tradiccion de OSX Panther 17af536
@sixviv sixviv Some grammar corrections 59efb16
@sixviv sixviv Fixing grammar errors 87d9877
@sixviv sixviv 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 sixviv WIP fe05391
@sixviv sixviv Install rvm and ruby traduction b3d6e0b
@sixviv sixviv Fixing grammar errors 47a4027
@sixviv sixviv 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
@tjgrathwell
Owner

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.

@alexch
Owner
@chischaschos

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
Something went wrong with that request. Please try again.