confllicto

Merge branch 'master' of https://github.com/medialab-prado/datamad2017

_config.yml

@@ -44,7 +44,11 @@ c4sponsorsUrl: "/assets/GDG_DevFest_Partnership.pdf"
 navigationLinks:
  - {permalink: "/", text: "Home"}
  - {permalink: "/blog/", text: "Blog"}
+<<<<<<< HEAD
  - {permalink: "/schedule/", text: "Agenda"}
+=======
+ - {permalink: "/schedule/", text: "Programa"}
+>>>>>>> 70c9e16dd222a80ca8e1fbaa063657f6b13f1a93
  - {permalink: "/speakers/", text: "Ponentes"}
  - {permalink: "/team/", text: "Equipo"}
  - {permalink: "/logistics/", text: "Logística"}
@@ -54,10 +58,17 @@ bottomNavigationLinks:
 rightNavigationButtons:
  - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
 
+<<<<<<< HEAD
 # Home Block
 homeImage: "medialab_exterior_architizer.jpg"
 homeTitle: "Premios de Datos Abiertos de Madrid <typeout> 2017"
 eventDate: "September - November, 2014"
+=======
+# Hero Block
+heroImage: "hero.jpg"
+heroTitle: "DataMad <typeout> 2017"
+eventDate: "Octubre - November, 2017"
+>>>>>>> 70c9e16dd222a80ca8e1fbaa063657f6b13f1a93
 typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"'
 typeoutFallback: "Season"
 heroButtons:
@@ -65,22 +76,22 @@ heroButtons:
  - {permalink: "/#tickets", text: "Buy tickets"}
 
 # About Block
-aboutTitle: "About GDG DevFest"
+aboutTitle: "Acerca del DataMad"
 aboutBlock:
- - {title: "Conference", image: "conference.jpg", text: "The biggest Google related event in the country carefully crafted for you by GDG community! Awesome speakers and lots of fun!" }
- - {title: "Workshops", image: "workshop.jpg", text: "Full-day of workshops, hands-on experience, hacking and debugging. Come and tame your favourite technology!" }
+ - {title: "Ponencias", image: "conference.jpg", text: "Representantes de organismos públicos nos hablarán de sus datos y servicios abiertos" }
  - {title: "Hackathon", image: "hackathon.jpg", text: "Full-day freestyle hackathon! Want some real team building on friday? Grab your team and join our hackathon!" }
+ - {title: "Premio Periodismo de Datos", image: "workshop.jpg", text: "Full-day of workshops, hands-on experience, hacking and debugging. Come and tame your favourite technology!" }
 
 # Statistic Block
 statisticBlockImage: "statistic.jpg"
 statisticBlock:
- - {count: "350", specialCharacter: "+", info: "attendees", detail: "from everywhere"}
- - {count: "48", specialCharacter: "+", info: "hours", detail: "of pure Google technologies"}
- - {count: "20", specialCharacter: "+", info: "speakers", detail: "from country and beyond"}
- - {count: "3", specialCharacter: "", info: "parallel tracks", detail: "plus entertainment lounge"}
+ - {count: "60", specialCharacter: "+", info: "asistentes", detail: "de diferentes perfiles"}
+ - {count: "48", specialCharacter: "+", info: "horas", detail: "de trabajo con datos abiertos"}
+ - {count: "4", specialCharacter: "+", info: "ponentes", detail: "de organismos públicos de la ciudad"}
+ - {count: "2", specialCharacter: "", info: "lineas paralelas de trabajo", detail: "plus entertainment lounge"}
 
 # Latest News Block
-latestNewsTitle: "Latest news"
+latestNewsTitle: "Últimas noticias"
 
 # Rockstar Speakers Block
 rockstarSpeakersImage: "rockstar-speakers.jpg"
@@ -105,7 +116,7 @@ mapCenterCoordinates: "40.41063,-3.69366"
 mapMobileCenterCoordinates: "40.41063,-3.69366"
 
 # Venue Block
-venueBlockTitle: "Venue"
+venueBlockTitle: "Instalaciones"
 venueBigImage: "venue_0.jpg"
 venueSmallImage1: "venue_1.jpg"
 venueSmallImage2: "venue_2.jpg"
@@ -116,12 +127,12 @@ venueFeatures: ["3 huge cinema screens", "Doulby Digital Surround EX audio syste
 # Tweets Feed Block
 tweetsFeedImage: "twitter-feed.jpg"
 tweetsFeedTitle: "What's Up?"
-twitterHashTag: "devfest"
+twitterHashTag: "datamad17"
 twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=8000"
 
 # Partners Block
-organizersTitle: "Organizers"
-partnersTitle: "Partners"
+organizersTitle: "Organizan"
+partnersTitle: "Colaboran"
 partnersC4sponsorsButton: "Become a sponsor"
 
 # Subscribe Block
@@ -131,16 +142,16 @@ subscribeAction: "https://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b05
 subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!"
 
 # Tickets Block
-ticketsTitle: "Pricetable"
+ticketsTitle: "Inscripciones"
 ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunch and party. Accommodation is NOT included in the ticket price."
 ticketsOffers:
  -
-  name: "Early Bird"
-  price: "350"
-  priceCurrency: "UAH"
-  ticketsNumber: "150"
+  name: "Presentación de proyectos"
+  price: ""
+  priceCurrency: ""
+  ticketsNumber: "8"
   ribbon: "-5%"
-  buyButtonLink: "http://dfua.ticketforevent.com/"
+  buyButtonLink: ""
   buyButtonText: "Buy Now"
   ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
   validFrom: "2014-08-25T10:00"