aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--en/timeline/index.php23
-rw-r--r--langs/en/timeline.en.lang58
-rw-r--r--langs/sl/timeline.sl.lang59
3 files changed, 108 insertions, 32 deletions
diff --git a/en/timeline/index.php b/en/timeline/index.php
index 893ded78a..d3ab14f70 100644
--- a/en/timeline/index.php
+++ b/en/timeline/index.php
@@ -34,7 +34,24 @@ _lang_load($locale, 'timeline');
<section>
<ul class="hl" id="tl0">
<li class="tliy">
- <h2>2012</h2>
+ <h2><?php _e('2013')?></h2>
+ <ul class="hl">
+ <li class="tlim">
+ <h3><?php _e('May')?></h3>
+ <ul class="hl">
+ <li class="tlie"><?php _e('<a href="/3/">Mageia 3</a> is released.')?></li>
+ </ul>
+ </li>
+ <li class="tlim">
+ <h3><?php _e('February')?></h3>
+ <ul class="hl">
+ <li class="tlie"><?php _e('Third General Assembly during FOSDEM in Brussels, Belgium.')?></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li class="tliy">
+ <h2><?php _e('2012')?></h2>
<ul class="hl">
<li class="tlim">
<h3><?php _e('May')?></h3>
@@ -51,7 +68,7 @@ _lang_load($locale, 'timeline');
</ul>
</li>
<li class="tliy">
- <h2>2011</h2>
+ <h2><?php _e('2011')?></h2>
<ul class="hl">
<li class="tlim">
<h3><?php _e('June')?></h3>
@@ -74,7 +91,7 @@ _lang_load($locale, 'timeline');
</ul>
</li>
<li class="tliy">
- <h2>2010</h2>
+ <h2><?php _e('2010')?></h2>
<ul class="hl">
<li class="tlim">
<h3><?php _e('End of year')?></h3>
diff --git a/langs/en/timeline.en.lang b/langs/en/timeline.en.lang
index fe42d1d20..bad76797f 100644
--- a/langs/en/timeline.en.lang
+++ b/langs/en/timeline.en.lang
@@ -1,4 +1,4 @@
-# Generated by extract2lang.php on 2013-05-26T14:17:16+02:00
+# Generated by extract2lang.php on 2013-08-15T07:28:37+00:00
# Domain timeline
# include translation strings from:
# en/timeline/index.php
@@ -8,14 +8,19 @@
Mageia Timeline
+# en/timeline/index.php +37
+;2013
+2013
+
+
# en/timeline/index.php +40
;May
May
# en/timeline/index.php +42
-;<a href="/2/">Mageia 2</a> is released.
-<a href="/2/">Mageia 2</a> is released.
+;<a href="/3/">Mageia 3</a> is released.
+<a href="/3/">Mageia 3</a> is released.
# en/timeline/index.php +46
@@ -24,60 +29,85 @@ February
# en/timeline/index.php +48
+;Third General Assembly during FOSDEM in Brussels, Belgium.
+Third General Assembly during FOSDEM in Brussels, Belgium.
+
+
+# en/timeline/index.php +54
+;2012
+2012
+
+
+# en/timeline/index.php +59
+;<a href="/2/">Mageia 2</a> is released.
+<a href="/2/">Mageia 2</a> is released.
+
+
+# en/timeline/index.php +65
;Second General Assembly during FOSDEM in Brussels, Belgium.
Second General Assembly during FOSDEM in Brussels, Belgium.
-# en/timeline/index.php +57
+# en/timeline/index.php +71
+;2011
+2011
+
+
+# en/timeline/index.php +74
;June
June
-# en/timeline/index.php +59
+# en/timeline/index.php +76
;<a href="/1/">Mageia 1</a> is released.
<a href="/1/">Mageia 1</a> is released.
-# en/timeline/index.php +65
+# en/timeline/index.php +82
;First General Assembly during FOSDEM in Brussels, Belgium.
First General Assembly during FOSDEM in Brussels, Belgium.
-# en/timeline/index.php +69
+# en/timeline/index.php +86
;January
January
-# en/timeline/index.php +71
+# en/timeline/index.php +88
;Build system is ready to run for the first alpha ISOs.
Build system is ready to run for the first alpha ISOs.
-# en/timeline/index.php +80
+# en/timeline/index.php +94
+;2010
+2010
+
+
+# en/timeline/index.php +97
;End of year
End of year
-# en/timeline/index.php +82
+# en/timeline/index.php +99
;With an incredible response, first donations and discussions abound.
With an incredible response, first donations and discussions abound.
-# en/timeline/index.php +83
+# en/timeline/index.php +100
;Project gets structured, governance takes slowly shape (first board, teams).
Project gets structured, governance takes slowly shape (first board, teams).
-# en/timeline/index.php +87
+# en/timeline/index.php +104
;September
September
-# en/timeline/index.php +89
+# en/timeline/index.php +106
;Mageia starts as a <a href="../about/2010-sept-announcement.html">fork of Mandriva Linux</a>.
Mageia starts as a <a href="../about/2010-sept-announcement.html">fork of Mandriva Linux</a>.
-# en/timeline/index.php +90
+# en/timeline/index.php +107
;Mageia.Org is registered in Paris, France.
Mageia.Org is registered in Paris, France.
diff --git a/langs/sl/timeline.sl.lang b/langs/sl/timeline.sl.lang
index cb1b52dcc..a298d2b92 100644
--- a/langs/sl/timeline.sl.lang
+++ b/langs/sl/timeline.sl.lang
@@ -1,4 +1,4 @@
-# Generated by extract2lang.php on 2013-05-26T14:17:16+02:00
+# Generated by extract2lang.php on 2013-08-15T07:28:37+00:00
# Domain timeline
# include translation strings from:
# en/timeline/index.php
@@ -8,14 +8,19 @@
Časovnica Mageje
+# en/timeline/index.php +37
+;2013
+2013 {ok}
+
+
# en/timeline/index.php +40
;May
maj
# en/timeline/index.php +42
-;<a href="/2/">Mageia 2</a> is released.
-Izdana je <a href="/2/">Mageia 2</a>.
+;<a href="/3/">Mageia 3</a> is released.
+Izdana je <a href="/3/">Mageia 3</a>.
# en/timeline/index.php +46
@@ -24,61 +29,85 @@ februar
# en/timeline/index.php +48
+;Third General Assembly during FOSDEM in Brussels, Belgium.
+Tretja generalna skupščina na sejmu FOSDEM v Bruslju.
+
+
+# en/timeline/index.php +54
+;2012
+2012 {ok}
+
+
+# en/timeline/index.php +59
+;<a href="/2/">Mageia 2</a> is released.
+Izdana je <a href="/2/">Mageia 2</a>.
+
+
+# en/timeline/index.php +65
;Second General Assembly during FOSDEM in Brussels, Belgium.
Druga generalna skupščina na sejmu FOSDEM v Bruslju.
-# en/timeline/index.php +57
+# en/timeline/index.php +71
+;2011
+2011 {ok}
+
+
+# en/timeline/index.php +74
;June
junij
-# en/timeline/index.php +59
+# en/timeline/index.php +76
;<a href="/1/">Mageia 1</a> is released.
Izdana je <a href="/1/">Mageia 1</a>.
-# en/timeline/index.php +65
+# en/timeline/index.php +82
;First General Assembly during FOSDEM in Brussels, Belgium.
Prva generalna skupščina na sejmu FOSDEM v Bruslju (Belgija).
-# en/timeline/index.php +69
+# en/timeline/index.php +86
;January
januar
-# en/timeline/index.php +71
+# en/timeline/index.php +88
;Build system is ready to run for the first alpha ISOs.
Sistem za gradnjo je pripravljen za izdajo prvih alfa slik ISO.
-# en/timeline/index.php +80
+# en/timeline/index.php +94
+;2010
+2010 {ok}
+
+
+# en/timeline/index.php +97
;End of year
konec leta
-# en/timeline/index.php +82
+# en/timeline/index.php +99
;With an incredible response, first donations and discussions abound.
Prvi odziv je bil neverjeten; donacij in razprav je na pretek.
-# en/timeline/index.php +83
+# en/timeline/index.php +100
;Project gets structured, governance takes slowly shape (first board, teams).
Projekt se strukturira, uprava se prične oblikovati (prvi odbor, ekipe).
-# en/timeline/index.php +87
+# en/timeline/index.php +104
;September
september
-# en/timeline/index.php +89
+# en/timeline/index.php +106
;Mageia starts as a <a href="../about/2010-sept-announcement.html">fork of Mandriva Linux</a>.
Mageia se je <a href="../about/2010-sept-announcement.html">odcepila</a> iz distribucije Mandriva Linux.
-
-# en/timeline/index.php +90
+# en/timeline/index.php +107
;Mageia.Org is registered in Paris, France.
Mageia.Org je registrirano združenje v Parizu (Francija).
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-22 15:41:26 +0000