added some missing strings in a few lang files

2 files changed, 184 insertions, 1 deletions

diff --git a/langs/zh-cn/2.zh-cn.lang b/langs/zh-cn/2.zh-cn.lang
index 5647ad051..62e4665c8 100644
--- a/langs/zh-cn/2.zh-cn.lang
+++ b/langs/zh-cn/2.zh-cn.lang
@@ -1,5 +1,12 @@
 # Generated by extract2lang.php on 2012-05-23T17:39:28+02:00
 # Domain 2
+# include translation from:
+# en/2/download_index.php
+# en/for-pc/index.php
+# en/for-server/index.php
+# en/2/index.php
+# en/2/nav.php
+
 
 ;page_title
 页面标题
@@ -76,6 +83,12 @@ LiveCD 只能用于新装。
 ;DO NOT use those LiveCDs to upgrade from Mageia 1!
 不要使用 LiveCD 从 Mageia 1 升级!
 
+
+# en/2/download_index.php +88
+;Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.
+Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.
+
+
 ;Included locales:
 包含的语系:
 
@@ -134,6 +147,147 @@ Need more challenge?
 ;You can help us <a href="%s">develop and quality-check Mageia 3</a>.
 You can help us <a href="%s">develop and quality-check Mageia 3</a>.
 
+
+# en/for-pc/index.php +12
+;Mageia 2, for your PC
+Mageia 2, for your PC
+
+
+# en/for-pc/index.php +21
+;for your PC
+for your PC
+
+
+# en/for-pc/index.php +26
+;Plenty
+Plenty
+
+
+# en/for-pc/index.php +27
+;There are 19&nbsp;881&nbsp;packages in our repositories. And that's just for the 64-bit branch.
+There are 19&nbsp;881&nbsp;packages in our repositories. And that's just for the 64-bit branch.
+
+
+# en/for-pc/index.php +28
+;The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you'll see that Mageia users are spoiled for choice.
+The total number is double that &ndash; and then if you consider the backports, and the packages in the Cauldron still testing... you'll see that Mageia users are spoiled for choice.
+
+
+# en/for-pc/index.php +29
+;Here's a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:
+Here's a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:
+
+
+# en/for-pc/index.php +30
+;Environments
+Environments
+
+
+# en/for-pc/index.php +31
+;Mageia 2 has all the major desktop environments:
+Mageia 2 has all the major desktop environments:
+
+
+# en/for-pc/index.php +44
+;And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.
+And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.
+
+
+# en/for-pc/index.php +45
+;Applications &rarr;
+Applications &rarr;
+
+
+# en/for-pc/index.php +46
+;There are many, many to choose from &ndash; including all the most popular.
+There are many, many to choose from &ndash; including all the most popular.
+
+
+# en/for-pc/index.php +53
+;Web
+Web
+
+
+# en/for-pc/index.php +54
+;Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.
+Choose your web browser from Firefox ESR 10.0.4, Chromium-browser 180.1025.160, Epiphany 3.4.1 or Opera 11.64 &ndash; or one of the many others such as Lynx or Konqueror; then pick an email client from KMail 4.8.2, Thunderbird ESR 10.0.4, Evolution 3.4.1 or maybe Claws-Mail or Mutt.
+
+
+# en/for-pc/index.php +59
+;Messaging
+Messaging
+
+
+# en/for-pc/index.php +60
+;Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.
+Choose from Kopete, Pidgin, Empathy or Kadu for instant messaging; use Quassel, Konversation, XChat-Gnome or KVIrc for IRC chat; try QuteCom or Ekiga (or even Skype) for VOIP.
+
+
+# en/for-pc/index.php +65
+;Office
+Office
+
+
+# en/for-pc/index.php +66
+;The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there's KMyMoney, Skrooge or the professional-level GnuCash.
+The two full-featured office suites LibreOffice and Calligra are there, as well as AbiWord, and a host of text editors including Kate; for finance there's KMyMoney, Skrooge or the professional-level GnuCash.
+
+
+# en/for-pc/index.php +71
+;Image
+Image
+
+
+# en/for-pc/index.php +72
+;Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.
+Use GIMP for powerful image manipulation, or Inkscape for vector drawing; Blender is there for serious animation. DigiKam or Showfoto will take care of your photos, talk to your camera and give you more basic image editing.
+
+
+# en/for-pc/index.php +77
+;Sound
+Sound
+
+
+# en/for-pc/index.php +78
+;For playing audio files, choose from Amarok 2.5.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don't infringe local laws.
+For playing audio files, choose from Amarok 2.5.0 and Rhythmbox, among others; use VLC, Totem or MPlayer for video and for audio, or use the XBMC Media Center as your home entertainment system. Some packages can be found in both the Core and Tainted repositories: the packages in the Core repository support only non-patent-encumbered codecs and the packages in the Tainted repository support all codecs, for users who live in countries where those codecs don't infringe local laws.
+
+
+# en/for-pc/index.php +83
+;Video
+Video
+
+
+# en/for-pc/index.php +84
+;For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there's Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.
+For editing video files, try Avidemux, Kino or OpenShot; for subtitles, there's Gaupol or Subtitles Composer; use MythTV, Miro, tvtime, FreetuxTV or Me TV for watching or recording TV programmes.
+
+
+# en/for-pc/index.php +89
+;Plus
+Plus
+
+
+# en/for-pc/index.php +90
+;Then there's ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.
+Then there's ZoneMinder, for CCTV Security; VirtualBox or WINE for virtualisation; and a range of development environments such as Anjuta, Eclipse, Netbeans or KDevelop.
+
+
+# en/for-pc/index.php +95
+;For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.
+For more information about these and other packages, check the <a href="%s">Mageia 2 Release notes</a>.
+
+
+# en/for-pc/index.php +96
+;You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
+You can take a look at the <a href="%s">Mageia Application Database</a> to get a more complete list of Mageia packages.
+
+
+# en/for-server/index.php +12
+;Mageia 2, for your server
+Mageia 2, for your server
+
+
 ;Download
 下载
 
@@ -149,16 +303,28 @@ You can help us <a href="%s">develop and quality-check Mageia 3</a>.
 ;Mageia 2 has all the main services and server packages you will need to run your server.
 Mageia 2 现在包含运行服务器所需的所有主流服务和服务器软件包。
 
+
+# en/for-server/index.php +27
+;Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the <a href="%s">Mageia App DB</a>.
+Aside from the cross-section included here, you will find many others in the repositories: you can use rpmdrake to search for packages, or check the <a href="%s">Mageia App DB</a>.
+
+
 ;Administration
 管理
 
+
+# en/for-server/index.php +31
+;For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.
+For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.
+
+
 ;The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.
 整个高可用性栈已经更新，现在包含 drbd 8.3.11, Corosync 2.0.0 和 Pacemaker 1.1.7。
 
 ;Databases
 数据库
 
-;Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB .
+;Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB.
 数据库现在包含 PostgreSQL 8.4.11; MariaDB 5.5.23 (替代了 MySQL); BDB。
 
 ;And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.
@@ -170,12 +336,24 @@ Mageia 2 现在包含运行服务器所需的所有主流服务和服务器软�
 ;Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.
 Web 服务器包括 Apache 2.2.22, Cherokee 1.2.101, lighttpd 1.4.30。
 
+
+# en/2/index.php +30
+;Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
+Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.
+
+
 ;Mageia in context
 Mageia 环境
 
 ;Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release.
 Mageia 代表一个社区，也代表一个 Linux 发行版，而 Mageia 2 是我们的第二个版本。
 
+
+# en/2/index.php +43
+;Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch's most popular distributions</a>.
+Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch's most popular distributions</a>.
+
+
 ;Mageia 2 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.
 Mageia 2 由<a href="../about/">Mageia.org 非营利性机构</a>支持，该机构由一组推选出来的志愿者所管理。
 
diff --git a/langs/zh-cn/map.zh-cn.lang b/langs/zh-cn/map.zh-cn.lang
index 789e11b1b..0d041e798 100644
--- a/langs/zh-cn/map.zh-cn.lang
+++ b/langs/zh-cn/map.zh-cn.lang
@@ -121,6 +121,11 @@
 产品生命周期
 
 
+# en/map/index.php +52
+;Official Documentation
+Official Documentation
+
+
 # en/map/index.php +53
 ;Community support
 社区支持