aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Komar <filip@mageia.org>2013-05-22 17:47:59 +0000
committerFilip Komar <filip@mageia.org>2013-05-22 17:47:59 +0000
commit5ff90d831d3a742e017aec72808d33321fea6dd8 (patch)
treeb764be19fbbe4f1095f9e59e6c288729538e3fad
parent0dc1adf9a33921d48712cada9e1d916268a9a932 (diff)
downloadwww-5ff90d831d3a742e017aec72808d33321fea6dd8.tar
www-5ff90d831d3a742e017aec72808d33321fea6dd8.tar.gz
www-5ff90d831d3a742e017aec72808d33321fea6dd8.tar.bz2
www-5ff90d831d3a742e017aec72808d33321fea6dd8.tar.xz
www-5ff90d831d3a742e017aec72808d33321fea6dd8.zip
support.en.lang synched with extract2lang.php + added missings strings to the rest of the lang files
-rw-r--r--langs/cs/support.cs.lang5
-rwxr-xr-xlangs/de/support.de.lang5
-rwxr-xr-xlangs/el/support.el.lang10
-rw-r--r--langs/en/support.en.lang80
-rw-r--r--langs/eo/support.eo.lang5
-rw-r--r--langs/pl/support.pl.lang6
-rwxr-xr-xlangs/pt-br/support.pt-br.lang10
-rwxr-xr-xlangs/pt/support.pt.lang5
-rw-r--r--langs/ro/support.ro.lang5
-rw-r--r--langs/sl/support.sl.lang78
-rw-r--r--langs/zh-cn/support.zh-cn.lang5
11 files changed, 136 insertions, 78 deletions
diff --git a/langs/cs/support.cs.lang b/langs/cs/support.cs.lang
index 884cf294e..96cac8656 100644
--- a/langs/cs/support.cs.lang
+++ b/langs/cs/support.cs.lang
@@ -44,6 +44,11 @@ Aktualizace
Můžete se přihlásit do našeho oznamovacího systému (%s), abyste na ně byli upozorňováni.
+# en/support/index.php +44
+;Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
+Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
+
+
;You can install these from the Mageia Control Center.
Instalovat je můžete z ovládacího centra Mageia.
diff --git a/langs/de/support.de.lang b/langs/de/support.de.lang
index 48f7094e7..024ef0a36 100755
--- a/langs/de/support.de.lang
+++ b/langs/de/support.de.lang
@@ -164,6 +164,11 @@ Mageia 1 wird bis zum 1. Dezember 2012 unterstützt.
;Mageia 2 will be supported until November 22nd, 2013.
Mageia 1 wird bis zum 22. November 2013 unterstützt.
+
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
;You may check and report bugs on <a href="%s">our Bugzilla (bugs.mageia.org)</a>.
Sie können Fehler (Bugs) in <a href="%s">unserem Bugzilla (bugs.mageia.org)</a> suchen und melden.
diff --git a/langs/el/support.el.lang b/langs/el/support.el.lang
index 09576eb63..9df0e7307 100755
--- a/langs/el/support.el.lang
+++ b/langs/el/support.el.lang
@@ -60,6 +60,11 @@ Updates are available for %s (security and bug fixes) and published on an ongoin
Κυκλοφορούν συστηματικά ενημερώσεις για %s (ασφαλείας και διόρθωσης σφαλμάτων).
+# en/support/index.php +44
+;Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
+Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
+
+
;You may subscribe to our %s announce list to be notified of these.
Μπορείτε να γραφτείτε στην λίστα ανακοινώσεων %s για να ενημερώνεστε σχετικά.
@@ -186,6 +191,11 @@ Mageia 1 was supported until December 1st, 2012.
Η Mageia 2 θα υποστηρίζεται μέχρι τις 22 Νοεμβρίου 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
+
;You may check and report bugs on <a href="%s">our Bugzilla (bugs.mageia.org)</a>.
Μπορείτε να ελέγξτε για σφάλματα ή να αναφέρετε νέα στην πλατφόρμα μας στο <a href="%s">Bugzilla (bugs.mageia.org)</a>.
diff --git a/langs/en/support.en.lang b/langs/en/support.en.lang
index e21e9da5b..53e002f82 100644
--- a/langs/en/support.en.lang
+++ b/langs/en/support.en.lang
@@ -1,189 +1,191 @@
-# Generated by extract2lang.php on 2012-12-21T15:21:21+01:00
+# Generated by extract2lang.php on 2013-05-22T18:22:07+02:00
# Domain support
-# ../../svn/web/en/support/index.php +11
+# en/support/index.php +11
;Support for Mageia distribution
Support for Mageia distribution
-# ../../svn/web/en/support/index.php +12
+# en/support/index.php +12
;List of support resources for Mageia distribution.
List of support resources for Mageia distribution.
-# ../../svn/web/en/support/index.php +13
+# en/support/index.php +13
;mageia, linux, support, help, hardware, qa, test
mageia, linux, support, help, hardware, qa, test
-# ../../svn/web/en/support/index.php +21
+# en/support/index.php +21
;Support
Support
-# ../../svn/web/en/support/index.php +23
+# en/support/index.php +23
;Community Support
Community Support
-# ../../svn/web/en/support/index.php +24
+# en/support/index.php +24
;Professional Support
Professional Support
-# ../../svn/web/en/support/index.php +25
+# en/support/index.php +25
;Documentation
Documentation
-# ../../svn/web/en/support/index.php +26
+# en/support/index.php +26
;Updates
Updates
-# ../../svn/web/en/support/index.php +27
+# en/support/index.php +27
;Lifecycle
Lifecycle
-# ../../svn/web/en/support/index.php +28
+# en/support/index.php +28
;Hardware Requirements
Hardware Requirements
-# ../../svn/web/en/support/index.php +29
+# en/support/index.php +29
;Bugs Reports
Bugs Reports
-# ../../svn/web/en/support/index.php +38
+# en/support/index.php +38
;You can look up existing %sdocumentation here%s. You may too look into our %sWiki%s.
You can look up existing %sdocumentation here%s. You may too look into our %sWiki%s.
-# ../../svn/web/en/support/index.php +44
+# en/support/index.php +44
;Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
-# ../../svn/web/en/support/index.php +45
+# en/support/index.php +45
;You can install these from the Mageia Control Center.
You can install these from the Mageia Control Center.
-# ../../svn/web/en/support/index.php +46
+# en/support/index.php +46
;You may subscribe to our %s announce list to be notified of these.
You may subscribe to our %s announce list to be notified of these.
-# ../../svn/web/en/support/index.php +50
+# en/support/index.php +50
;Mageia releases are supported at least for 18 months.
Mageia releases are supported at least for 18 months.
-# ../../svn/web/en/support/index.php +52
+# en/support/index.php +52
;Mageia 1 was supported until December 1st, 2012.
Mageia 1 was supported until December 1st, 2012.
-# ../../svn/web/en/support/index.php +53
+# en/support/index.php +53
;Mageia 2 will be supported until November 22nd, 2013.
Mageia 2 will be supported until November 22nd, 2013.
-# added manually
+
+# en/support/index.php +54
;Mageia 3 will be supported until November 19th, 2014.
Mageia 3 will be supported until November 19th, 2014.
-# ../../svn/web/en/support/index.php +58
+
+# en/support/index.php +59
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
-# ../../svn/web/en/support/index.php +61
+# en/support/index.php +62
;<a href="http://forums.mageia.org/en/">Community support forums</a> in English &ndash; see <a href="https://forums.mageia.org/en/viewforum.php?f=20">other Mageia community forums</a> for support in your language;
<a href="http://forums.mageia.org/en/">Community support forums</a> in English &ndash; see <a href="https://forums.mageia.org/en/viewforum.php?f=20">other Mageia community forums</a> for support in your language;
-# ../../svn/web/en/support/index.php +62
+# en/support/index.php +63
;IRC channels where you can discuss live with other Mageia users and contributors: <a href="irc://irc.freenode.net/#mageia" hreflang="en">#mageia</a> or other localized <a href="https://wiki.mageia.org/en/IRC#channels_in_other_languages">channels</a>;
IRC channels where you can discuss live with other Mageia users and contributors: <a href="irc://irc.freenode.net/#mageia" hreflang="en">#mageia</a> or other localized <a href="https://wiki.mageia.org/en/IRC#channels_in_other_languages">channels</a>;
-# ../../svn/web/en/support/index.php +63
+# en/support/index.php +64
;our <a href="https://wiki.mageia.org/en/">Wiki</a> (still rough at the time, we are working on it!);
our <a href="https://wiki.mageia.org/en/">Wiki</a> (still rough at the time, we are working on it!);
-# ../../svn/web/en/support/index.php +64
+# en/support/index.php +65
;our <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">mailing-lists</a>;
our <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">mailing-lists</a>;
-# ../../svn/web/en/support/index.php +65
+# en/support/index.php +66
;local events: follow our <a href="http://blog.mageia.org/en/">blog</a> and <a href="http://www.mageia.org/en/calendar/">calendar</a>.
local events: follow our <a href="http://blog.mageia.org/en/">blog</a> and <a href="http://www.mageia.org/en/calendar/">calendar</a>.
-# ../../svn/web/en/support/index.php +70
+# en/support/index.php +71
;Mageia.Org does not provide or endorse commercial/professional support or other services around the distribution. But there are organizations providing such services and more.
Mageia.Org does not provide or endorse commercial/professional support or other services around the distribution. But there are organizations providing such services and more.
-# ../../svn/web/en/support/index.php +71
+# en/support/index.php +72
;Please check the <a href="%s">commercial vendors</a> list
Please check the <a href="%s">commercial vendors</a> list
-# ../../svn/web/en/support/index.php +76
+# en/support/index.php +77
;Mageia software runs on most x86 computer systems available as of today, April 2011.
Mageia software runs on most x86 computer systems available as of today, April 2011.
-# ../../svn/web/en/support/index.php +77
+# en/support/index.php +78
;You can follow this hardware requirements list:
You can follow this hardware requirements list:
-# ../../svn/web/en/support/index.php +80
+# en/support/index.php +81
;Processor: any AMD, Intel or VIA processor;
Processor: any AMD, Intel or VIA processor;
-# ../../svn/web/en/support/index.php +81
+# en/support/index.php +82
;Memory (RAM): 512MB minimum, 2GB recommended;
Memory (RAM): 512MB minimum, 2GB recommended;
-# ../../svn/web/en/support/index.php +82
+# en/support/index.php +83
;Storage (HDD): 1GB for a minimal installation, 6GB for a full setup;
Storage (HDD): 1GB for a minimal installation, 6GB for a full setup;
-# ../../svn/web/en/support/index.php +83
+# en/support/index.php +84
;Optical drive: CD or DVD depending on the ISO you use (network, USB key installation available);
Optical drive: CD or DVD depending on the ISO you use (network, USB key installation available);
-# ../../svn/web/en/support/index.php +84
+# en/support/index.php +85
;Graphic card: any ATI, Intel, Matrox, nVidia, SiS or VIA graphic card;
Graphic card: any ATI, Intel, Matrox, nVidia, SiS or VIA graphic card;
-# ../../svn/web/en/support/index.php +85
+# en/support/index.php +86
;Sound card: any AC97, HDA or Sound Blaster sound card.
Sound card: any AC97, HDA or Sound Blaster sound card.
-# ../../svn/web/en/support/index.php +88
+# en/support/index.php +89
;For some kinds of hardware (Wi-Fi chipsets, 3D graphic cards) to work properly, specific firmware or software may be needed, this is available in a specific online repository called "nonfree" (<a href="https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media">learn more</a>).
For some kinds of hardware (Wi-Fi chipsets, 3D graphic cards) to work properly, specific firmware or software may be needed, this is available in a specific online repository called "nonfree" (<a href="https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media">learn more</a>).
-# ../../svn/web/en/support/index.php +89
+# en/support/index.php +90
;We may set up a hardware compatibility list/directory as well as a hardware certification process; but that's still at the planning stage. Feel free to join/contact our <a href="%s">Web</a> and <a href="%s">QA</a> teams if you would like to help in this regard.
We may set up a hardware compatibility list/directory as well as a hardware certification process; but that's still at the planning stage. Feel free to join/contact our <a href="%s">Web</a> and <a href="%s">QA</a> teams if you would like to help in this regard.
-# ../../svn/web/en/support/index.php +93
+# en/support/index.php +94
;You may check and report bugs on <a href="%s">our Bugzilla (bugs.mageia.org)</a>.
You may check and report bugs on <a href="%s">our Bugzilla (bugs.mageia.org)</a>.
diff --git a/langs/eo/support.eo.lang b/langs/eo/support.eo.lang
index 762d2cb97..b5c80a8d3 100644
--- a/langs/eo/support.eo.lang
+++ b/langs/eo/support.eo.lang
@@ -94,6 +94,11 @@ Magejo 1 estos subtenata ĝis la 1a de decembro, 2012.
Magejo 2 estos subtenanta ĝis la 22a de decembro, 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
+
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
Se vi bezonas helpon, informon aŭ adresojn pri la distribuaĵo Magejo aŭ pri la projekto, vi povas kontakti nin per:
diff --git a/langs/pl/support.pl.lang b/langs/pl/support.pl.lang
index b2a042c1d..847bb3ccb 100644
--- a/langs/pl/support.pl.lang
+++ b/langs/pl/support.pl.lang
@@ -192,5 +192,11 @@ Mageia 1 będzie wspierana do 1 grudnia 2012.
Mageia 2 będzie wspierana do 22 listopada 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+# en/support/index.php +65
+;our <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">mailing-lists</a>;
+our <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">mailing-lists</a>;
diff --git a/langs/pt-br/support.pt-br.lang b/langs/pt-br/support.pt-br.lang
index b3642ee12..ca5837e17 100755
--- a/langs/pt-br/support.pt-br.lang
+++ b/langs/pt-br/support.pt-br.lang
@@ -66,6 +66,11 @@ Você pode procurar existente %sdocumentation aqui%s. Você também pode olhar e
Atualizações estão disponíveis para %s (segurança e correções de bugs) e publicado em uma base contínua.
+# en/support/index.php +44
+;Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
+Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
+
+
# ../../svn/web/en/support/index.php +45
;You can install these from the Mageia Control Center.
Você pode instalar esses do centro de controle da Mageia.
@@ -91,6 +96,11 @@ Mageia 1 teve suporte até 01 de dezembro de 2012.
Mageia 2 terá atualizações até o dia 22 de Novembro de 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
+
# ../../svn/web/en/support/index.php +58
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
Se você precisar de ajuda, informações ou direções sobre a distribuição Mageia que você instalou ou sobre o projeto, você pode tentar contactar-nos através de:
diff --git a/langs/pt/support.pt.lang b/langs/pt/support.pt.lang
index 0f1684a4e..2ef190683 100755
--- a/langs/pt/support.pt.lang
+++ b/langs/pt/support.pt.lang
@@ -94,6 +94,11 @@ Mageia 1 will be supported until December 1st, 2012.
Mageia 2 will be supported until November 22nd, 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
+
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
Se precisa de ajuda, informação ou direcções acerca da distribuição Mageia que instalou ou acerca do projecto, pode tentar contactar-nos através de:
diff --git a/langs/ro/support.ro.lang b/langs/ro/support.ro.lang
index 60d30e955..b4b208a6d 100644
--- a/langs/ro/support.ro.lang
+++ b/langs/ro/support.ro.lang
@@ -98,6 +98,11 @@ Mageia 1 a fost suportat pînă la 1 decembrie 2012.
Mageia 2 este suportată pînă pe 22 noiembrie 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
+
# ../../svn/web/en/support/index.php +58
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
Dacă aveți nevoie de ajutor sau informații despre distribuția Mageia pe care ați instalat-o sau despre proiect, puteți încerca să ne contactați prin:
diff --git a/langs/sl/support.sl.lang b/langs/sl/support.sl.lang
index 34774b6e3..daf898427 100644
--- a/langs/sl/support.sl.lang
+++ b/langs/sl/support.sl.lang
@@ -1,191 +1,191 @@
-# Generated by extract2lang.php on 2012-12-21T15:21:21+01:00
+# Generated by extract2lang.php on 2013-05-22T18:22:07+02:00
# Domain support
-# ../../svn/web/en/support/index.php +11
+# en/support/index.php +11
;Support for Mageia distribution
Podpora za distribucijo Mageia
-# ../../svn/web/en/support/index.php +12
+# en/support/index.php +12
;List of support resources for Mageia distribution.
Seznam virov pomoči za distribucijo Mageia.
-# ../../svn/web/en/support/index.php +13
+# en/support/index.php +13
;mageia, linux, support, help, hardware, qa, test
mageia, linux, podpora, pomoč, strojna oprema, qa, test
-# ../../svn/web/en/support/index.php +21
+# en/support/index.php +21
;Support
Podpora
-# ../../svn/web/en/support/index.php +23
+# en/support/index.php +23
;Community Support
Podpora skupnosti
-# ../../svn/web/en/support/index.php +24
+# en/support/index.php +24
;Professional Support
Profesionalna podpora
-# ../../svn/web/en/support/index.php +25
+# en/support/index.php +25
;Documentation
Dokumentacija
-# ../../svn/web/en/support/index.php +26
+# en/support/index.php +26
;Updates
Posodobitve
-# ../../svn/web/en/support/index.php +27
+# en/support/index.php +27
;Lifecycle
Življenjski cikel
-# ../../svn/web/en/support/index.php +28
+# en/support/index.php +28
;Hardware Requirements
Strojne zahteve
-# ../../svn/web/en/support/index.php +29
+# en/support/index.php +29
;Bugs Reports
Poročanje hroščev
-# ../../svn/web/en/support/index.php +38
+# en/support/index.php +38
;You can look up existing %sdocumentation here%s. You may too look into our %sWiki%s.
Obstoječo dokumentacijo lahko pogledate %stukaj%s ali v našem %sWikiju%s.
-# ../../svn/web/en/support/index.php +44
+# en/support/index.php +44
;Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.
Posodobitve so na voljo za izdajo %s in %s (varnostne izboljšave in popravki hroščev).
-# ../../svn/web/en/support/index.php +45
+# en/support/index.php +45
;You can install these from the Mageia Control Center.
Namestite jih lahko iz Nadzornega središča Mageia.
-# ../../svn/web/en/support/index.php +46
+# en/support/index.php +46
;You may subscribe to our %s announce list to be notified of these.
Za obveščanje o posodobitvah se lahko naročite na našem seznamu »%s«.
-# ../../svn/web/en/support/index.php +50
+# en/support/index.php +50
;Mageia releases are supported at least for 18 months.
Posamezne verzije Mageia so podprte vsaj 18 mesecev.
-# ../../svn/web/en/support/index.php +52
+# en/support/index.php +52
;Mageia 1 was supported until December 1st, 2012.
Mageia 1 je bila podprta do 1. decembra 2012.
-# ../../svn/web/en/support/index.php +53
+# en/support/index.php +53
;Mageia 2 will be supported until November 22nd, 2013.
Mageia 2 bo podprta do 22. novembra 2013.
-# ../../svn/web/en/support/index.php +54
+# en/support/index.php +54
;Mageia 3 will be supported until November 19th, 2014.
Mageia 3 bo podprta do 19. novembra 2014.
-# ../../svn/web/en/support/index.php +58
+# en/support/index.php +59
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
Pomoč, informacije ali navodila o distribuciji Mageia ali o projektu, lahko najdete na:
-# ../../svn/web/en/support/index.php +61
+# en/support/index.php +62
;<a href="http://forums.mageia.org/en/">Community support forums</a> in English &ndash; see <a href="https://forums.mageia.org/en/viewforum.php?f=20">other Mageia community forums</a> for support in your language;
<a href="http://forums.mageia.org/en/">forumu s podporo skupnosti</a> v angleškem jeziku &ndash; ali <a href="https://forums.mageia.org/en/viewforum.php?f=20">drugih forumih Mageia</a> s podporo v drugih jezikih;
-# ../../svn/web/en/support/index.php +62
+# en/support/index.php +63
;IRC channels where you can discuss live with other Mageia users and contributors: <a href="irc://irc.freenode.net/#mageia" hreflang="en">#mageia</a> or other localized <a href="https://wiki.mageia.org/en/IRC#channels_in_other_languages">channels</a>;
IRC kanalih, kjer lahko v angleščini v živo razpravljate z drugimi uporabniki Mageje in njenimi soustvarjalci: <a href="irc://irc.freenode.net/#mageia" hreflang="en">#mageia</a> ali <a href="https://wiki.mageia.org/en/IRC#channels_in_other_languages">kanali</a> v drugih jezikih;
-# ../../svn/web/en/support/index.php +63
+# en/support/index.php +64
;our <a href="https://wiki.mageia.org/en/">Wiki</a> (still rough at the time, we are working on it!);
na <a href="https://wiki.mageia.org/en/">Wikiju</a> (trenutno je še nepopoln, a delamo na tem!);
-# ../../svn/web/en/support/index.php +64
+# en/support/index.php +65
;our <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">mailing-lists</a>;
na naših <a href="https://wiki.mageia.org/en/Mailing_lists" hreflang="en">poštnih seznamih</a>;
-# ../../svn/web/en/support/index.php +65
+# en/support/index.php +66
;local events: follow our <a href="http://blog.mageia.org/en/">blog</a> and <a href="http://www.mageia.org/en/calendar/">calendar</a>.
na lokalnih dogodkih: sledite našemu <a href="http://blog.mageia.org/en/">blogu</a> in <a href="http://www.mageia.org/en/calendar/">koledarju</a>.
-# ../../svn/web/en/support/index.php +70
+# en/support/index.php +71
;Mageia.Org does not provide or endorse commercial/professional support or other services around the distribution. But there are organizations providing such services and more.
Mageia.Org ne nudi ali potrjuje poslovne/profesionalne podpore ali drugih storitev v distribuciji. Vendar pa obstajajo organizacije, ki opravljajo takšne storitve in še več.
-# ../../svn/web/en/support/index.php +71
+# en/support/index.php +72
;Please check the <a href="%s">commercial vendors</a> list
Preverite seznam <a href="%s">komercialnih ponudnikov</a>
-# ../../svn/web/en/support/index.php +76
+# en/support/index.php +77
;Mageia software runs on most x86 computer systems available as of today, April 2011.
Programska oprema Mageia deluje na večini x86 računalniških sistemov, ki so sedaj na voljo.
-# ../../svn/web/en/support/index.php +77
+# en/support/index.php +78
;You can follow this hardware requirements list:
Lahko sledite temu seznamu strojnih zahtev:
-# ../../svn/web/en/support/index.php +80
+# en/support/index.php +81
;Processor: any AMD, Intel or VIA processor;
Procesor: katerikoli procesor AMD, Intel ali VIA;
-# ../../svn/web/en/support/index.php +81
+# en/support/index.php +82
;Memory (RAM): 512MB minimum, 2GB recommended;
Spomin (RAM): minimalno 512MB, priporočeno 2GB;
-# ../../svn/web/en/support/index.php +82
+# en/support/index.php +83
;Storage (HDD): 1GB for a minimal installation, 6GB for a full setup;
Medij za shranjevanje (trdi disk; HDD): za minimalno namestitev 1GB, za popolno nastavitev 6GB;
-# ../../svn/web/en/support/index.php +83
+# en/support/index.php +84
;Optical drive: CD or DVD depending on the ISO you use (network, USB key installation available);
Optični pogon: CD ali DVD odvisno od slike ISO, ki jo uporabite (na voljo je namestitev iz omrežja, ali ključka USB);
-# ../../svn/web/en/support/index.php +84
+# en/support/index.php +85
;Graphic card: any ATI, Intel, Matrox, nVidia, SiS or VIA graphic card;
Grafična kartica: katerikoli ATI, Intel, Matrox, nVidia, SiS ali VIA;
-# ../../svn/web/en/support/index.php +85
+# en/support/index.php +86
;Sound card: any AC97, HDA or Sound Blaster sound card.
Zvočna kartica: katerikoli AC97, HDA ali Sound Blaster.
-# ../../svn/web/en/support/index.php +88
+# en/support/index.php +89
;For some kinds of hardware (Wi-Fi chipsets, 3D graphic cards) to work properly, specific firmware or software may be needed, this is available in a specific online repository called "nonfree" (<a href="https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media">learn more</a>).
Za pravilno delovanje nekaterih vrst strojne opreme (Wi-Fi čipovje, 3D grafične kartice), je lahko potrebna določena strojna programska oprema ali posebna programska oprema. Le-te so na voljo v skladišču paketov imenovanem "nonfree" (<a href="https://wiki.mageia.org/en/Install_media_in_Mageia_2_for_beginner#Types_of_Mageia_media">več o tem</a>).
-# ../../svn/web/en/support/index.php +89
+# en/support/index.php +90
;We may set up a hardware compatibility list/directory as well as a hardware certification process; but that's still at the planning stage. Feel free to join/contact our <a href="%s">Web</a> and <a href="%s">QA</a> teams if you would like to help in this regard.
Možno je, da bomo sestavili seznam združljive strojne opreme, kot tudi proces njenega potrjevanja, a to je še vedno v fazi načrtovanja. Po želji se nam pridružite ali se obrnite na našo <a href="%s">spletno</a> in <a href="%s">QA</a> ekipo, če bi želeli pomagati v zvezi s tem.
-# ../../svn/web/en/support/index.php +93
+# en/support/index.php +94
;You may check and report bugs on <a href="%s">our Bugzilla (bugs.mageia.org)</a>.
Lahko jih preverite ali poročate v <a href="%s">naši Bugzilli (bugs.mageia.org)</a>.
diff --git a/langs/zh-cn/support.zh-cn.lang b/langs/zh-cn/support.zh-cn.lang
index d5fd710fd..e2850576d 100644
--- a/langs/zh-cn/support.zh-cn.lang
+++ b/langs/zh-cn/support.zh-cn.lang
@@ -98,6 +98,11 @@ Mageia 1 已于2012年12月1日结束支持。
Mageia 2 will be supported until November 22nd, 2013.
+# en/support/index.php +54
+;Mageia 3 will be supported until November 19th, 2014.
+Mageia 3 will be supported until November 19th, 2014.
+
+
# ../../svn/web/en/support/index.php +58
;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through:
If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through: