aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2013-05-19 22:47:01 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2013-05-19 22:47:01 +0000
commited9f79164baaefe26a6120d78c110aea9ea2e094 (patch)
tree39f110efd41e7e3e9f16b2d63bca932654ab5f58
parentbc8eec57f333a81b7622b0a6d53f8ef4e4f02b3f (diff)
downloadwww-ed9f79164baaefe26a6120d78c110aea9ea2e094.tar
www-ed9f79164baaefe26a6120d78c110aea9ea2e094.tar.gz
www-ed9f79164baaefe26a6120d78c110aea9ea2e094.tar.bz2
www-ed9f79164baaefe26a6120d78c110aea9ea2e094.tar.xz
www-ed9f79164baaefe26a6120d78c110aea9ea2e094.zip
add Mageia 3 cd/dvd covers
-rw-r--r--en/about/media/index.php16
-rw-r--r--g/media/covers/3/Mga3CD.pngbin0 -> 649285 bytes
-rw-r--r--g/media/covers/3/Mga3DVD.pngbin0 -> 650427 bytes
-rw-r--r--g/media/covers/3/Mga3Plain.pngbin0 -> 638646 bytes
-rw-r--r--g/media/covers/3/Mga3_Free_CD_dual.pngbin0 -> 654762 bytes
-rw-r--r--g/media/covers/3/Mga3_Free_DVD_32.pngbin0 -> 654878 bytes
-rw-r--r--g/media/covers/3/Mga3_Free_DVD_64.pngbin0 -> 654953 bytes
-rw-r--r--g/media/covers/3/Mga3_Live_CD_32_Gnome.pngbin0 -> 667349 bytes
-rw-r--r--g/media/covers/3/Mga3_Live_CD_32_KDE.pngbin0 -> 662238 bytes
-rw-r--r--g/media/covers/3/Mga3_Live_DVD_32_Gnome.pngbin0 -> 667032 bytes
-rw-r--r--g/media/covers/3/Mga3_Live_DVD_32_KDE.pngbin0 -> 661890 bytes
-rw-r--r--g/media/covers/3/Mga3_Live_DVD_64_Gnome.pngbin0 -> 667110 bytes
-rw-r--r--g/media/covers/3/Mga3_Live_DVD_64_KDE.pngbin0 -> 661968 bytes
-rw-r--r--g/media/covers/3/t-Mga3CD.pngbin0 -> 7899 bytes
-rw-r--r--g/media/covers/3/t-Mga3DVD.pngbin0 -> 8023 bytes
-rw-r--r--g/media/covers/3/t-Mga3Plain.pngbin0 -> 7586 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Free_CD_dual.pngbin0 -> 8394 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Free_DVD_32.pngbin0 -> 8522 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Free_DVD_64.pngbin0 -> 8522 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Live_CD_32_Gnome.pngbin0 -> 8793 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Live_CD_32_KDE.pngbin0 -> 8606 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Live_DVD_32_Gnome.pngbin0 -> 8905 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Live_DVD_32_KDE.pngbin0 -> 8715 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Live_DVD_64_Gnome.pngbin0 -> 8905 bytes
-rw-r--r--g/media/covers/3/t-Mga3_Live_DVD_64_KDE.pngbin0 -> 8718 bytes
-rw-r--r--langs/en/about/media.en.lang8
-rw-r--r--langs/fr/about/media.fr.lang9
27 files changed, 28 insertions, 5 deletions
diff --git a/en/about/media/index.php b/en/about/media/index.php
index 5fb032f29..da450eba5 100644
--- a/en/about/media/index.php
+++ b/en/about/media/index.php
@@ -48,8 +48,22 @@ _lang_load($locale, "about/media");
<p><?php echo sprintf(_t('%sPNG</a> or %sSVG</a>'), '<a href="/g/media/logo/mageia-2011.png"><img src="/g/media/logo/t-mageia-2011.png"><br>', '<a href="/g/media/logo/mageia-2011.svg">') ?></p>
<hr>
+ <h2><?php _e('Mageia 3 CD/DVD covers')?></h2>
+ <p><a href="/g/media/covers/3/Mga3Plain.png"><img src="/g/media/covers/3/t-Mga3Plain.png" alt="Mageia 3 logo" title="Mga3Plain"></a>
+ <a href="/g/media/covers/3/Mga3CD.png"><img src="/g/media/covers/3/t-Mga3CD.png" alt="Mageia 3 logo" title="Mga3CD"></a>
+ <a href="/g/media/covers/3/Mga3DVD.png"><img src="/g/media/covers/3/t-Mga3DVD.png" alt="Mageia 3 logo" title="Mga3DVD"></a>
+ <a href="/g/media/covers/3/Mga3_Free_CD_dual.png"><img src="/g/media/covers/3/t-Mga3_Free_CD_dual.png" alt="Mageia 3 logo" title="Mga3_Free_CD_dual"></a>
+ <a href="/g/media/covers/3/Mga3_Free_DVD_32.png"><img src="/g/media/covers/3/t-Mga3_Free_DVD_32.png" alt="Mageia 3 logo" title="Mga3_Free_DVD_32"></a>
+ <a href="/g/media/covers/3/t-Mga3_Free_DVD_64.png"><img src="/g/media/covers/3/t-Mga3_Free_DVD_64.png" alt="Mageia 3 logo" title="Mga3_Free_DVD_64"></a>
+ <a href="/g/media/covers/3/Mga3_Live_CD_32_Gnome.png"><img src="/g/media/covers/3/t-Mga3_Live_CD_32_Gnome.png" alt="Mageia 3 logo" title="Mga3_Live_CD_32_Gnome"></a>
+ <a href="/g/media/covers/3/Mga3_Live_CD_32_KDE.png"><img src="/g/media/covers/3/t-Mga3_Live_CD_32_KDE.png" alt="Mageia 3 logo" title="Mga3_Live_CD_32_KDE"></a>
+ <a href="/g/media/covers/3/t-Mga3_Live_DVD_32_Gnome.png"><img src="/g/media/covers/3/t-Mga3_Live_DVD_32_Gnome.png" alt="Mageia 3 logo" title="Mga3_Live_DVD_32_Gnome"></a>
+ <a href="/g/media/covers/3/Mga3_Live_DVD_32_KDE.png"><img src="/g/media/covers/3/t-Mga3_Live_DVD_32_KDE.png" alt="Mageia 3 logo" title="Mga3_Live_DVD_32_KDE"></a>
+ <a href="/g/media/covers/3/Mga3_Live_DVD_64_Gnome.png"><img src="/g/media/covers/3/t-Mga3_Live_DVD_64_Gnome.png" alt="Mageia 3 logo" title="/Mga3_Live_DVD_64_Gnome"></a>
+ <a href="/g/media/covers/3/Mga3_Live_DVD_64_KDE.png"><img src="/g/media/covers/3/t-Mga3_Live_DVD_64_KDE.png" alt="Mageia 3 logo" title="Mga3_Live_DVD_64_KDE"></a></p>
+ <br>
- <h2><?php _e('Mageia 1 CD/DVD cover')?></h2>
+ <h2><?php _e('Mageia 1 CD/DVD covers')?></h2>
<p><a href="/g/media/covers/print-1.png"><img src="/g/media/covers/t-print-1.png" alt=""></a>
<a href="/g/media/covers/print-2.png"><img src="/g/media/covers/t-print-2.png" alt=""></a>
<a href="/g/media/covers/print-3.png"><img src="/g/media/covers/t-print-3.png" alt=""></a></p>
diff --git a/g/media/covers/3/Mga3CD.png b/g/media/covers/3/Mga3CD.png
new file mode 100644
index 000000000..4d62dc064
--- /dev/null
+++ b/g/media/covers/3/Mga3CD.png
Binary files differ
diff --git a/g/media/covers/3/Mga3DVD.png b/g/media/covers/3/Mga3DVD.png
new file mode 100644
index 000000000..ddf653d60
--- /dev/null
+++ b/g/media/covers/3/Mga3DVD.png
Binary files differ
diff --git a/g/media/covers/3/Mga3Plain.png b/g/media/covers/3/Mga3Plain.png
new file mode 100644
index 000000000..428c6c129
--- /dev/null
+++ b/g/media/covers/3/Mga3Plain.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Free_CD_dual.png b/g/media/covers/3/Mga3_Free_CD_dual.png
new file mode 100644
index 000000000..4e2532f33
--- /dev/null
+++ b/g/media/covers/3/Mga3_Free_CD_dual.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Free_DVD_32.png b/g/media/covers/3/Mga3_Free_DVD_32.png
new file mode 100644
index 000000000..5f518fb4e
--- /dev/null
+++ b/g/media/covers/3/Mga3_Free_DVD_32.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Free_DVD_64.png b/g/media/covers/3/Mga3_Free_DVD_64.png
new file mode 100644
index 000000000..47c65d636
--- /dev/null
+++ b/g/media/covers/3/Mga3_Free_DVD_64.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Live_CD_32_Gnome.png b/g/media/covers/3/Mga3_Live_CD_32_Gnome.png
new file mode 100644
index 000000000..1e58e128d
--- /dev/null
+++ b/g/media/covers/3/Mga3_Live_CD_32_Gnome.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Live_CD_32_KDE.png b/g/media/covers/3/Mga3_Live_CD_32_KDE.png
new file mode 100644
index 000000000..151da99e9
--- /dev/null
+++ b/g/media/covers/3/Mga3_Live_CD_32_KDE.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Live_DVD_32_Gnome.png b/g/media/covers/3/Mga3_Live_DVD_32_Gnome.png
new file mode 100644
index 000000000..77d105038
--- /dev/null
+++ b/g/media/covers/3/Mga3_Live_DVD_32_Gnome.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Live_DVD_32_KDE.png b/g/media/covers/3/Mga3_Live_DVD_32_KDE.png
new file mode 100644
index 000000000..72130740a
--- /dev/null
+++ b/g/media/covers/3/Mga3_Live_DVD_32_KDE.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Live_DVD_64_Gnome.png b/g/media/covers/3/Mga3_Live_DVD_64_Gnome.png
new file mode 100644
index 000000000..c9c46d068
--- /dev/null
+++ b/g/media/covers/3/Mga3_Live_DVD_64_Gnome.png
Binary files differ
diff --git a/g/media/covers/3/Mga3_Live_DVD_64_KDE.png b/g/media/covers/3/Mga3_Live_DVD_64_KDE.png
new file mode 100644
index 000000000..3a0640e2b
--- /dev/null
+++ b/g/media/covers/3/Mga3_Live_DVD_64_KDE.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3CD.png b/g/media/covers/3/t-Mga3CD.png
new file mode 100644
index 000000000..e3352be5f
--- /dev/null
+++ b/g/media/covers/3/t-Mga3CD.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3DVD.png b/g/media/covers/3/t-Mga3DVD.png
new file mode 100644
index 000000000..11190f00b
--- /dev/null
+++ b/g/media/covers/3/t-Mga3DVD.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3Plain.png b/g/media/covers/3/t-Mga3Plain.png
new file mode 100644
index 000000000..568af0ba3
--- /dev/null
+++ b/g/media/covers/3/t-Mga3Plain.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Free_CD_dual.png b/g/media/covers/3/t-Mga3_Free_CD_dual.png
new file mode 100644
index 000000000..b3199fb73
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Free_CD_dual.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Free_DVD_32.png b/g/media/covers/3/t-Mga3_Free_DVD_32.png
new file mode 100644
index 000000000..7d408711c
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Free_DVD_32.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Free_DVD_64.png b/g/media/covers/3/t-Mga3_Free_DVD_64.png
new file mode 100644
index 000000000..9ce118417
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Free_DVD_64.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Live_CD_32_Gnome.png b/g/media/covers/3/t-Mga3_Live_CD_32_Gnome.png
new file mode 100644
index 000000000..ce80da2d2
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Live_CD_32_Gnome.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Live_CD_32_KDE.png b/g/media/covers/3/t-Mga3_Live_CD_32_KDE.png
new file mode 100644
index 000000000..6edc765e9
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Live_CD_32_KDE.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Live_DVD_32_Gnome.png b/g/media/covers/3/t-Mga3_Live_DVD_32_Gnome.png
new file mode 100644
index 000000000..efdff978f
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Live_DVD_32_Gnome.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Live_DVD_32_KDE.png b/g/media/covers/3/t-Mga3_Live_DVD_32_KDE.png
new file mode 100644
index 000000000..0e210b9c6
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Live_DVD_32_KDE.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Live_DVD_64_Gnome.png b/g/media/covers/3/t-Mga3_Live_DVD_64_Gnome.png
new file mode 100644
index 000000000..5c27e5181
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Live_DVD_64_Gnome.png
Binary files differ
diff --git a/g/media/covers/3/t-Mga3_Live_DVD_64_KDE.png b/g/media/covers/3/t-Mga3_Live_DVD_64_KDE.png
new file mode 100644
index 000000000..cb9e8de3b
--- /dev/null
+++ b/g/media/covers/3/t-Mga3_Live_DVD_64_KDE.png
Binary files differ
diff --git a/langs/en/about/media.en.lang b/langs/en/about/media.en.lang
index 43819acbd..47ede94f5 100644
--- a/langs/en/about/media.en.lang
+++ b/langs/en/about/media.en.lang
@@ -45,9 +45,13 @@ Mageia 2013 alpha
TODO: usage guidelines.
+# added mnually
+;Mageia 3 CD/DVD covers
+Mageia 3 CD/DVD covers
+
# ../../svn/web/en/about/media/index.php +53
-;Mageia 1 CD/DVD cover
-Mageia 1 CD/DVD cover
+;Mageia 1 CD/DVD covers
+Mageia 1 CD/DVD covers
# ../../svn/web/en/about/media/index.php +57
diff --git a/langs/fr/about/media.fr.lang b/langs/fr/about/media.fr.lang
index 0a9ff6ec6..3e1f867e3 100644
--- a/langs/fr/about/media.fr.lang
+++ b/langs/fr/about/media.fr.lang
@@ -46,8 +46,13 @@ Mageia 2013 alpha {ok}
# ../../svn/web/en/about/media/index.php +32
-;Mageia 1 CD/DVD cover
-Couverture des CD/DVD de Mageia 1
+ ;Mageia 1 CD/DVD covers
+ Couverture des CD/DVD de Mageia 1
+
+
+# ../../svn/web/en/about/media/index.php +32
+;Mageia 3 CD/DVD covers
+Couverture des CD/DVD de Mageia 2
# ../../svn/web/en/about/media/index.php +36