Merge branch 'master' into fight-entropy

Conflicts:
	english/events/Makefile

10 files changed, 66 insertions, 5 deletions

diff --git a/english/partners/2018/Makefile b/english/partners/2018/Makefile
index 3495069968c..df1fb3a4d49 100644
--- a/english/partners/2018/Makefile
+++ b/english/partners/2018/Makefile
@@ -13,5 +13,6 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \
                         $(ENGLISHSRCDIR)/partners/partners.def \
                         $(ENGLISHSRCDIR)/partners/2018/images/*.png \
                         $(ENGLISHSRCDIR)/partners/2018/images/*.jpg \
+                        $(ENGLISHSRCDIR)/partners/2018/images/*.svg \
                         $(GETTEXTDEP)
 
diff --git a/english/partners/2018/images/google.svg b/english/partners/2018/images/google.svg
new file mode 100644
index 00000000000..87531e564c3
--- /dev/null
+++ b/english/partners/2018/images/google.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260 88" width="260" height="88">
+    <path fill="#4285F4" d="M33 40.24v-8.75h30.48c.32 1.6.48 3.55.48 5.63 0 6.72-1.84 15.04-7.76 20.96-5.76 6-13.12 9.2-22.88 9.2C15.24 67.28.04 52.56.04 34.48s15.2-32.8 33.28-32.8c10 0 17.12 3.92 22.48 9.04l-6.32 6.32c-3.84-3.6-9.04-6.4-16.16-6.4-13.2 0-23.52 10.64-23.52 23.84s10.32 23.84 23.52 23.84c8.56 0 13.44-3.44 16.56-6.56 2.56-2.56 4.28-6.48 4.92-11.52H33z"/>
+    <path fill="#EA4335" d="M109.7 46.16c0 12.16-9.52 21.12-21.2 21.12s-21.2-8.96-21.2-21.12c0-12.24 9.52-21.12 21.2-21.12s21.2 8.88 21.2 21.12zm-9.28 0c0-7.6-5.52-12.8-11.92-12.8s-11.92 5.2-11.92 12.8c0 7.52 5.52 12.8 11.92 12.8s11.92-5.28 11.92-12.8z"/>
+    <path fill="#FBBC05" d="M155.7 46.16c0 12.16-9.52 21.12-21.2 21.12s-21.2-8.96-21.2-21.12c0-12.24 9.52-21.12 21.2-21.12s21.2 8.88 21.2 21.12zm-9.28 0c0-7.6-5.52-12.8-11.92-12.8s-11.92 5.2-11.92 12.8c0 7.52 5.52 12.8 11.92 12.8s11.92-5.28 11.92-12.8z"/>
+    <path fill="#4285F4" d="M199.81 26.32v37.92c0 15.6-9.2 22-20.08 22-10.24 0-16.4-6.88-18.72-12.48l8.08-3.36c1.44 3.44 4.96 7.52 10.64 7.52 6.96 0 11.28-4.32 11.28-12.4v-3.04h-.32c-2.08 2.56-6.08 4.8-11.12 4.8-10.56 0-20.24-9.2-20.24-21.04 0-11.92 9.68-21.2 20.24-21.2 5.04 0 9.04 2.24 11.12 4.72h.32v-3.44h8.8zm-8.16 19.92c0-7.44-4.96-12.88-11.28-12.88-6.4 0-11.76 5.44-11.76 12.88 0 7.36 5.36 12.72 11.76 12.72 6.32 0 11.28-5.36 11.28-12.72z"/>
+    <path fill="#34A853" d="M215.29 4v62h-9.28V4h9.28z"/>
+    <path fill="#EA4335" d="M251.19 53.12l7.2 4.8c-2.32 3.44-7.92 9.36-17.6 9.36-12 0-20.96-9.28-20.96-21.12 0-12.56 9.04-21.12 19.92-21.12 10.96 0 16.32 8.72 18.08 13.44l.96 2.4-28.24 11.68c2.16 4.24 5.52 6.4 10.24 6.4 4.72 0 8-2.32 10.4-5.84zm-22.16-7.6l18.88-7.84c-1.04-2.64-4.16-4.48-7.84-4.48-4.72 0-11.28 4.16-11.04 12.32z"/>
+    <path fill="none" d="M0 0h260v88H0z"/>
+</svg>
\ No newline at end of file
diff --git a/english/partners/2018/partners.data b/english/partners/2018/partners.data
index 643518b551a..358a16bf683 100644
--- a/english/partners/2018/partners.data
+++ b/english/partners/2018/partners.data
@@ -102,7 +102,18 @@
  </div>
  
  <hr>
-
+ 
+ <div id="Google">
+ <partnerlogo "Google" google.svg "https://www.google.com/">
+ # last update: 2019/03/20 (new addition)
+ <partnerdesc>
+ <google1>
+ <google2>
+ </partnerdesc>
+ </div>
+ 
+ <hr> 
+ 
  <div id="HPE">
  <partnerlogo "HPE" hpe.png "http://www.hpe.com/engage/opensource">
  # last update: 2017/03/25 (new logo, update description)
diff --git a/english/partners/2019/Makefile b/english/partners/2019/Makefile
index 03d789adebb..b20fe5f8224 100644
--- a/english/partners/2019/Makefile
+++ b/english/partners/2019/Makefile
@@ -13,5 +13,6 @@ index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/template.wml \
                         $(ENGLISHSRCDIR)/partners/partners.def \
                         $(ENGLISHSRCDIR)/partners/2019/images/*.png \
                         $(ENGLISHSRCDIR)/partners/2019/images/*.jpg \
+                        $(ENGLISHSRCDIR)/partners/2019/images/*.svg \
                         $(GETTEXTDEP)
 
diff --git a/english/partners/2019/images/Makefile b/english/partners/2019/images/Makefile
index bb92da5c183..eb68d01a31a 100644
--- a/english/partners/2019/images/Makefile
+++ b/english/partners/2019/images/Makefile
@@ -2,7 +2,7 @@
 # there should be no need to copy this file to translation directories.
 
 WMLBASE=../../..
-CUR_DIR=partners/2018/images
+CUR_DIR=partners/2019/images
 SUBS=
 
 include $(WMLBASE)/Make.lang
diff --git a/english/partners/2019/images/google.svg b/english/partners/2019/images/google.svg
new file mode 100644
index 00000000000..87531e564c3
--- /dev/null
+++ b/english/partners/2019/images/google.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260 88" width="260" height="88">
+    <path fill="#4285F4" d="M33 40.24v-8.75h30.48c.32 1.6.48 3.55.48 5.63 0 6.72-1.84 15.04-7.76 20.96-5.76 6-13.12 9.2-22.88 9.2C15.24 67.28.04 52.56.04 34.48s15.2-32.8 33.28-32.8c10 0 17.12 3.92 22.48 9.04l-6.32 6.32c-3.84-3.6-9.04-6.4-16.16-6.4-13.2 0-23.52 10.64-23.52 23.84s10.32 23.84 23.52 23.84c8.56 0 13.44-3.44 16.56-6.56 2.56-2.56 4.28-6.48 4.92-11.52H33z"/>
+    <path fill="#EA4335" d="M109.7 46.16c0 12.16-9.52 21.12-21.2 21.12s-21.2-8.96-21.2-21.12c0-12.24 9.52-21.12 21.2-21.12s21.2 8.88 21.2 21.12zm-9.28 0c0-7.6-5.52-12.8-11.92-12.8s-11.92 5.2-11.92 12.8c0 7.52 5.52 12.8 11.92 12.8s11.92-5.28 11.92-12.8z"/>
+    <path fill="#FBBC05" d="M155.7 46.16c0 12.16-9.52 21.12-21.2 21.12s-21.2-8.96-21.2-21.12c0-12.24 9.52-21.12 21.2-21.12s21.2 8.88 21.2 21.12zm-9.28 0c0-7.6-5.52-12.8-11.92-12.8s-11.92 5.2-11.92 12.8c0 7.52 5.52 12.8 11.92 12.8s11.92-5.28 11.92-12.8z"/>
+    <path fill="#4285F4" d="M199.81 26.32v37.92c0 15.6-9.2 22-20.08 22-10.24 0-16.4-6.88-18.72-12.48l8.08-3.36c1.44 3.44 4.96 7.52 10.64 7.52 6.96 0 11.28-4.32 11.28-12.4v-3.04h-.32c-2.08 2.56-6.08 4.8-11.12 4.8-10.56 0-20.24-9.2-20.24-21.04 0-11.92 9.68-21.2 20.24-21.2 5.04 0 9.04 2.24 11.12 4.72h.32v-3.44h8.8zm-8.16 19.92c0-7.44-4.96-12.88-11.28-12.88-6.4 0-11.76 5.44-11.76 12.88 0 7.36 5.36 12.72 11.76 12.72 6.32 0 11.28-5.36 11.28-12.72z"/>
+    <path fill="#34A853" d="M215.29 4v62h-9.28V4h9.28z"/>
+    <path fill="#EA4335" d="M251.19 53.12l7.2 4.8c-2.32 3.44-7.92 9.36-17.6 9.36-12 0-20.96-9.28-20.96-21.12 0-12.56 9.04-21.12 19.92-21.12 10.96 0 16.32 8.72 18.08 13.44l.96 2.4-28.24 11.68c2.16 4.24 5.52 6.4 10.24 6.4 4.72 0 8-2.32 10.4-5.84zm-22.16-7.6l18.88-7.84c-1.04-2.64-4.16-4.48-7.84-4.48-4.72 0-11.28 4.16-11.04 12.32z"/>
+    <path fill="none" d="M0 0h260v88H0z"/>
+</svg>
\ No newline at end of file
diff --git a/english/partners/2019/index.wml b/english/partners/2019/index.wml
index 096d431277b..a90dd5fbd6b 100644
--- a/english/partners/2019/index.wml
+++ b/english/partners/2019/index.wml
@@ -7,12 +7,12 @@
 and list of current partners can be viewed at the
 <a href="..">main partners program page</a>.
 
-<h3>2018 Partners Program conditions</h3>
+<h3>2019 Partners Program conditions</h3>
 
 <p>For more information on the Debian Partners Program for the year 2019, visit
-the  <a href="./partners">2019 Partners Program</a>.</p>
+the <a href="./partners">2019 Partners Program</a>.</p>
 
-<h3>2018 Partners</h3>
+<h3>2019 Partners</h3>
 
 #include "$(ENGLISHDIR)/partners/2019/partners.data"
 
diff --git a/english/partners/2019/partners.data b/english/partners/2019/partners.data
index d445b79a0f3..0b1d2ae0e67 100644
--- a/english/partners/2019/partners.data
+++ b/english/partners/2019/partners.data
@@ -103,6 +103,17 @@
  
  <hr>
 
+ <div id="Google">
+ <partnerlogo "Google" google.svg "https://www.google.com/">
+ # last update: 2019/03/20 (new addition)
+ <partnerdesc>
+ <google1>
+ <google2>
+ </partnerdesc>
+ </div>
+
+<hr>
+   
  <div id="HPE">
  <partnerlogo "HPE" hpe.png "http://www.hpe.com/engage/opensource">
  # last update: 2017/03/25 (new logo, update description)
diff --git a/english/partners/images/google.svg b/english/partners/images/google.svg
new file mode 100644
index 00000000000..87531e564c3
--- /dev/null
+++ b/english/partners/images/google.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260 88" width="260" height="88">
+    <path fill="#4285F4" d="M33 40.24v-8.75h30.48c.32 1.6.48 3.55.48 5.63 0 6.72-1.84 15.04-7.76 20.96-5.76 6-13.12 9.2-22.88 9.2C15.24 67.28.04 52.56.04 34.48s15.2-32.8 33.28-32.8c10 0 17.12 3.92 22.48 9.04l-6.32 6.32c-3.84-3.6-9.04-6.4-16.16-6.4-13.2 0-23.52 10.64-23.52 23.84s10.32 23.84 23.52 23.84c8.56 0 13.44-3.44 16.56-6.56 2.56-2.56 4.28-6.48 4.92-11.52H33z"/>
+    <path fill="#EA4335" d="M109.7 46.16c0 12.16-9.52 21.12-21.2 21.12s-21.2-8.96-21.2-21.12c0-12.24 9.52-21.12 21.2-21.12s21.2 8.88 21.2 21.12zm-9.28 0c0-7.6-5.52-12.8-11.92-12.8s-11.92 5.2-11.92 12.8c0 7.52 5.52 12.8 11.92 12.8s11.92-5.28 11.92-12.8z"/>
+    <path fill="#FBBC05" d="M155.7 46.16c0 12.16-9.52 21.12-21.2 21.12s-21.2-8.96-21.2-21.12c0-12.24 9.52-21.12 21.2-21.12s21.2 8.88 21.2 21.12zm-9.28 0c0-7.6-5.52-12.8-11.92-12.8s-11.92 5.2-11.92 12.8c0 7.52 5.52 12.8 11.92 12.8s11.92-5.28 11.92-12.8z"/>
+    <path fill="#4285F4" d="M199.81 26.32v37.92c0 15.6-9.2 22-20.08 22-10.24 0-16.4-6.88-18.72-12.48l8.08-3.36c1.44 3.44 4.96 7.52 10.64 7.52 6.96 0 11.28-4.32 11.28-12.4v-3.04h-.32c-2.08 2.56-6.08 4.8-11.12 4.8-10.56 0-20.24-9.2-20.24-21.04 0-11.92 9.68-21.2 20.24-21.2 5.04 0 9.04 2.24 11.12 4.72h.32v-3.44h8.8zm-8.16 19.92c0-7.44-4.96-12.88-11.28-12.88-6.4 0-11.76 5.44-11.76 12.88 0 7.36 5.36 12.72 11.76 12.72 6.32 0 11.28-5.36 11.28-12.72z"/>
+    <path fill="#34A853" d="M215.29 4v62h-9.28V4h9.28z"/>
+    <path fill="#EA4335" d="M251.19 53.12l7.2 4.8c-2.32 3.44-7.92 9.36-17.6 9.36-12 0-20.96-9.28-20.96-21.12 0-12.56 9.04-21.12 19.92-21.12 10.96 0 16.32 8.72 18.08 13.44l.96 2.4-28.24 11.68c2.16 4.24 5.52 6.4 10.24 6.4 4.72 0 8-2.32 10.4-5.84zm-22.16-7.6l18.88-7.84c-1.04-2.64-4.16-4.48-7.84-4.48-4.72 0-11.28 4.16-11.04 12.32z"/>
+    <path fill="none" d="M0 0h260v88H0z"/>
+</svg>
\ No newline at end of file
diff --git a/english/partners/partners.def b/english/partners/partners.def
index ef2003d1cf8..2569423b3e4 100644
--- a/english/partners/partners.def
+++ b/english/partners/partners.def
@@ -106,6 +106,16 @@
  <p><gettext domain="partners">Genesi's <a href="http://www.genesi-usa.com/products">Efika MX</a> ARM-based computers are designed to bring low cost, energy efficient computing resources to the mass market. For information about Genesi's involvement in the Linux Open Source community, please visit <a href="http://www.powerdeveloper.org/">www.PowerDeveloper.org.</a></gettext></p> 
  </define-tag> 
 
+## Google
+# last update: 2019/03/20 (News addition)
+
+ <define-tag google1 whitespace=delete> 
+ <p><gettext domain="partners"><a href="https://www.google.com">Google</a> sponsors parts of Salsa's continuous integration infrastructure within Google Cloud Platform.</gettext></p> 
+ </define-tag> 
+ <define-tag google2 whitespace=delete> 
+ <p><gettext domain="partners">Google is one of the largest technology companies in the world, providing a wide range of Internet-related services and products as online advertising technologies, search, cloud computing, software, and hardware.</gettext></p> 
+ </define-tag> 
+
 ## HPE 
 # last update: 2017/03/25 (new logo, update description)