[gnome-system-log] Revert a8e9278e0e2cb8bd25c10a3d5fa01043c0280ea7

[YunQiang Su <yqsu src gnome org>]

commit ed25167748209be338d4ab73ab07b8940780e7b2
Author: YunQiang Su <yqsu src gnome org>
Date:   Sun Sep 23 04:54:09 2012 +0800

    Revert a8e9278e0e2cb8bd25c10a3d5fa01043c0280ea7
    
    Update zh_CN translation, the former commit pushed gnome-user-share
    mistaken.

 po/zh_CN.po |  516 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 283 insertions(+), 233 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba411b5..c3efaa7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,19 +1,23 @@
-# gnome-user-shareççääæçè.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-user-share package.
-# Funda Wang <fundawang gmail com>, 2005, 2009.
-# çé(Gan Lu) <rhythm gan gmail com>, 2009.
-# Hinker <hinkerliu 163 com>, 2009.
-# Aron Xu <happyaron xu gmail com>, 2009.
+# translation of gnome-utils.po to zh_CN
+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnome-utils package.
+# Sun G11n <gnome_int_l10n ireland sun com> 2002
+# Wang Li <charlesw1234 163 com>, 2001
+# Xiong Jiang <jxiong offtopic org>, 2003
+# Funda Wang <fundawang linux net cn>, 2003-2005
+# Hinker <hinkerliu gmail com>, 2009.
+# chiachen <luojiazhen gmail com>, 2011.
+# Aron Xu <happyaron xu gmail com>, 2009, 2011.
+# Cheng Lu <chenglu1990 gmail com>, 2012.
 # YunQiang Su <wzssyqa gmail com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-user-share master\n"
+"Project-Id-Version: gnome-utils master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"user-share&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-24 15:46+0000\n"
-"PO-Revision-Date: 2012-09-23 04:41+0800\n"
+"system-log&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-22 20:41+0000\n"
+"PO-Revision-Date: 2012-09-23 04:53+0800\n"
 "Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -23,258 +27,304 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:1
-msgid "Share Public directory over the network"
-msgstr "åççäåäâååâçå"
+#: ../data/gnome-system-log.desktop.in.in.h:1 ../src/logview-app.c:304
+#: ../src/logview-window.c:1178
+msgid "System Log"
+msgstr "ççæå"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:2
-msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over the network when the user is logged in."
-msgstr "åæäç(true)ïåçæçåæïçæäçåäçâååâçåååççäåäã"
+#: ../data/gnome-system-log.desktop.in.in.h:2
+msgid "View or monitor system log files"
+msgstr "æçæçèççæåæä"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:3
-msgid "When to require passwords"
-msgstr "äæèæåç"
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:1
+msgid "Log file to open up on startup"
+msgstr "ååææåçæåæä"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:4
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:2
 msgid ""
-"When to ask for passwords. Possible values are \"never\", \"on_write\", and "
-"\"always\"."
-msgstr "äæèéåçïåäéæçééæïâneverâãâon_writeâåâalwaysâã"
+"Specifies the log file displayed at startup. The default is either /var/adm/"
+"messages or /var/log/messages, depending on your operating system."
+msgstr ""
+"æååçåååææççæåæäãæææçæäççäåïéèæ /var/adm/"
+"messages æè /var/log/messagesã"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:5
-msgid "Share Public directory over Bluetooth"
-msgstr "åèçäåäâååâçå"
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:3
+msgid "Size of the font used to display the log"
+msgstr "çäæçæåçåäåå"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:6
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:4
 msgid ""
-"If this is true, the Public directory in the users home directory will be "
-"shared over Bluetooth when the user is logged in."
-msgstr "åæäç(true)ïåçæçåæïçæäçåäçâååâçåååèçäåäã"
+"Specifies the size of the fixed-width font used to display the log in the "
+"main tree view. The default is taken from the default terminal font size."
+msgstr ""
+"æåçäåäæèåäæçæåççååäååãéèåæèäéèççåäååã"
+
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:5
+msgid "Height of the main window in pixels"
+msgstr "äçåçéåïäåçè"
+
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:6
+msgid "Specifies the height of the log viewer main window in pixels."
+msgstr "æåæåæçåäçåçéåïäåçèã"
+
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:7
+msgid "Width of the main window in pixels"
+msgstr "äçåçååïäåçè"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:7
-msgid "Whether to allow Bluetooth clients to write files."
-msgstr "æååèèçåæååæäã"
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:8
+msgid "Specifies the width of the log viewer main window in pixels."
+msgstr "æåæåæçåäçåçååïäåçèã"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:8
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:9
+msgid "Log files to open up on startup"
+msgstr "ååææåçæåæä"
+
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:10
 msgid ""
-"Whether to allow Bluetooth clients to write files, or share the files read-"
-"only."
-msgstr "æååèèçåæååæäïèæååèèååäæäã"
+"Specifies a list of log files to open up at startup. A default list is "
+"created by reading /etc/syslog.conf."
+msgstr ""
+"æååçåååæèæåçæåæäãéèåèåäéèèå /etc/syslog.conf å"
+"åã"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:9
-msgid "Whether Bluetooth clients need to pair with the computer to send files."
-msgstr "èçåæèåéæäæåéèååçèéåã"
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:11
+msgid "List of saved filters"
+msgstr "åäåèæåçåè"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:10
-msgid "Whether Bluetooth clients can send files using ObexPush."
-msgstr "èçåææåèäç ObexPus åéæäã"
+#: ../data/org.gnome.gnome-system-log.gschema.xml.in.h:12
+msgid "List of saved regexp filters"
+msgstr "ääåæåèèåèæåçåè"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:11
+#: ../src/logview-about.h:49
 msgid ""
-"If this is true, Bluetooth devices can send files to the user's Downloads "
-"directory when logged in."
-msgstr "åæäç(true)ïåçæçåæïèçèåèåéæäåçæçâäèâçåã"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"æçåæèçèäïæåäåèçèäåéäååç GNU éçååèåèçææäéæ"
+"ååå(æ)äæåïæåäéæäç GPL çäçïæ(æçæçææ)ääææççæã"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:12
-msgid "When to accept files sent over Bluetooth"
-msgstr "äæææéèèçåéçæä"
+#: ../src/logview-about.h:53
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
+msgstr ""
+"åèæçåæåæåææäçïäææääæäïææääæççæäæåæäçåç"
+"çèéçãæåçèèåè GNU éçååèåèã"
 
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:13
+#: ../src/logview-about.h:57
 msgid ""
-"When to accept files sent over Bluetooth. Possible values are \"always\", "
-"\"bonded\" and \"ask\"."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
 msgstr ""
-"äææåéèèçåéçæäïåèçéé"
-"æâalwaysâãâbondedâãâbonded_trustedâåâaskâã"
-
-#: ../data/org.gnome.desktop.file-sharing.gschema.xml.in.in.h:14
-msgid "Whether to notify about newly received files."
-msgstr "æåéçåäææåçæäã"
-
-#: ../data/file-share-properties.ui.h:1
-msgid "Personal File Sharing Preferences"
-msgstr "ääæäåäéé"
-
-#: ../data/file-share-properties.ui.h:2
-msgid "Share Files over the Network"
-msgstr "åççäåäæä"
-
-#: ../data/file-share-properties.ui.h:3
-msgid "_Share public files on network"
-msgstr "åççäåäååæä(_S)"
-
-#: ../data/file-share-properties.ui.h:4
-msgid "_Password:"
-msgstr "åç(_P)ï"
-
-#: ../data/file-share-properties.ui.h:5
-msgid "_Require password:"
-msgstr "èæåç(_R)"
-
-#: ../data/file-share-properties.ui.h:6
-msgid "Share Files over Bluetooth"
-msgstr "åèçäåäæä"
-
-#: ../data/file-share-properties.ui.h:7
-msgid "Share public files over _Bluetooth"
-msgstr "åèçäåäååæä(_B)"
-
-#: ../data/file-share-properties.ui.h:8
-msgid "Allo_w remote devices to delete files"
-msgstr "åèèçèååéæä(_W)"
-
-#: ../data/file-share-properties.ui.h:9
-msgid "Require re_mote devices to bond with this computer"
-msgstr "èæèçèåäæçèçå"
-
-#: ../data/file-share-properties.ui.h:10
-msgid "Receive Files over Bluetooth"
-msgstr "ææéèèçåéçæä"
-
-#: ../data/file-share-properties.ui.h:11
-msgid "Receive files in _Downloads folder over Bluetooth"
-msgstr "ææéèèçåéçæäåâäèâæäåä(_D)"
-
-#: ../data/file-share-properties.ui.h:12
-msgid "_Accept files: "
-msgstr "æææä(_A)ï"
-
-#: ../data/file-share-properties.ui.h:13
-msgid "_Notify about received files"
-msgstr "éçåäåæåçæä(_N)"
-
-#: ../data/gnome-user-share-properties.desktop.in.h:1
-#: ../data/gnome-user-share.desktop.in.in.h:1 ../src/nautilus-share-bar.c:102
-msgid "Personal File Sharing"
-msgstr "ääæäåä"
-
-#: ../data/gnome-user-share-properties.desktop.in.h:2
-msgid "Preferences for sharing of files"
-msgstr "æäåäéé"
-
-#: ../data/gnome-user-share.desktop.in.in.h:2
-msgid "Launch Personal File Sharing if enabled"
-msgstr "åæååçåååääæäåä"
-
-#: ../src/nautilus-share-bar.c:116
-#| msgid "Launch Preferences"
-msgid "Preferences"
-msgstr "ééé"
-
-#: ../src/nautilus-share-bar.c:120
-msgid "Launch Personal File Sharing Preferences"
-msgstr "ääæäåäéé"
-
-#: ../src/share-extension.c:69
-#| msgid "Unable to launch the Personal File Sharing preferences"
-msgid "Unable to launch the Personal File Sharing Preferences"
-msgstr "ææååääæäåäééé"
-
-#: ../src/share-extension.c:142
-msgid "May be used to share or receive files"
-msgstr "åäçäåäææææä"
-
-#: ../src/share-extension.c:144
-#| msgid "You can share files from this folder over the network and Bluetooth"
-msgid "May be shared over the network or Bluetooth"
-msgstr "æåäéèççæèçåä"
-
-#: ../src/share-extension.c:146
-#| msgid "Receive Files over Bluetooth"
-msgid "May be used to receive files over Bluetooth"
-msgstr "åäçäéèèçæææä"
-
-#: ../src/file-share-properties.c:290
-msgid "No reason"
-msgstr "æåå"
-
-#: ../src/file-share-properties.c:318
-msgid "Could not display the help contents."
-msgstr "æææçååçåã"
-
-#: ../src/file-share-properties.c:351
-msgid "Could not build interface."
-msgstr "ææååçéã"
-
-#: ../src/file-share-properties.c:383
-msgid "Never"
-msgstr "ää"
-
-#: ../src/file-share-properties.c:386
-msgid "When writing files"
-msgstr "ååæäæ"
-
-#: ../src/file-share-properties.c:389 ../src/file-share-properties.c:412
-msgid "Always"
-msgstr "ææ"
-
-#: ../src/file-share-properties.c:415
-msgid "Only for set up devices"
-msgstr "äåçåçèå"
-
-#: ../src/file-share-properties.c:420
-msgid "Ask"
-msgstr "èé"
-
-#. Translators: The %s will get filled in with the user name
-#. of the user, to form a genitive. If this is difficult to
-#. translate correctly so that it will work correctly in your
-#. language, you may use something equivalent to
-#. "Public files of %s", or leave out the %s altogether.
-#. In the latter case, please put "%.0s" somewhere in the string,
-#. which will match the user name string passed by the C code,
-#. but not put the user name in the final string. This is to
-#. avoid the warning that msgfmt might otherwise generate.
-#: ../src/http.c:133
+"äåèåçéæçåäèæåää GNU éçååèåèåæïåæææïäåäåä"
+"ç \"\"the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+"Boston, \"\"MA 02110-1301, USA \""
+
+#. translator credits
+#: ../src/logview-about.h:63
+msgid "translator-credits"
+msgstr ""
+"Wang Li <charlesw1234 163 com>\n"
+"Funda Wang <fundawang linux net cn>"
+
+#: ../src/logview-app.c:287
 #, c-format
-msgid "%s's public files"
-msgstr "%s çååæä"
+msgid "There was an error displaying help: %s"
+msgstr "æçååæåçéèï%s"
+
+#: ../src/logview-app.c:309
+msgid "A system log viewer for GNOME."
+msgstr "GNOME ççæåæçåã"
 
-#. Translators: This is similar to the string before, only it
-#. has the hostname in it too.
-#: ../src/http.c:137
+#: ../src/logview-app.c:437
 #, c-format
-msgid "%s's public files on %s"
-msgstr "%s å %s äçååæä"
+msgid "Impossible to open the file %s"
+msgstr "æææåæä %s"
+
+#: ../src/logview-app-menu.ui.h:1
+msgid "Auto Scroll"
+msgstr "èåæå"
+
+#: ../src/logview-app-menu.ui.h:2
+msgid "About System Log"
+msgstr "åäççæå"
+
+#: ../src/logview-app-menu.ui.h:3
+msgid "Help"
+msgstr "åå"
 
-#. Translators: %s is the name of the filename received
-#: ../src/obexpush.c:133
+#: ../src/logview-app-menu.ui.h:4
+msgid "Quit"
+msgstr "éå"
+
+#: ../src/logview-filter-manager.c:92
+msgid "Filter name is empty!"
+msgstr "èæååçäçï"
+
+#: ../src/logview-filter-manager.c:105
+msgid "Filter name may not contain the ':' character"
+msgstr "èæååçäèååâ:âåç"
+
+#: ../src/logview-filter-manager.c:128
+msgid "Regular expression is empty!"
+msgstr "æåèèåäçï"
+
+#: ../src/logview-filter-manager.c:144
 #, c-format
-msgid "You received \"%s\" via Bluetooth"
-msgstr "äéèèçæåäâ%sâ"
+msgid "Regular expression is invalid: %s"
+msgstr "ææçæåèèåï%s"
+
+#: ../src/logview-filter-manager.c:238
+msgid "Please specify either foreground or background color!"
+msgstr "èæåæåææèæéèï"
 
-#: ../src/obexpush.c:135
-msgid "You received a file"
-msgstr "äæåäääæä"
+#: ../src/logview-filter-manager.c:292
+msgid "Edit filter"
+msgstr "çèèæå"
 
-#: ../src/obexpush.c:145
-msgid "Open File"
-msgstr "æåæä"
+#: ../src/logview-filter-manager.c:292
+msgid "Add new filter"
+msgstr "æåæçèæå"
 
-#: ../src/obexpush.c:149
-msgid "Reveal File"
-msgstr "æçæä"
+#: ../src/logview-filter-manager.c:506 ../src/logview-gear-menu.ui.h:8
+msgid "Filters"
+msgstr "æä"
 
-#: ../src/obexpush.c:166
-msgid "File reception complete"
-msgstr "æäææåæ"
+#: ../src/logview-filter.ui.h:1
+msgid "_Name:"
+msgstr "åç(_N)ï"
 
-#~ msgid "You can share files from this folder and receive files to it"
-#~ msgstr "æåääçææäååäæä"
+#: ../src/logview-filter.ui.h:2
+msgid "_Regular Expression:"
+msgstr "æåèèå(_R)ï"
 
-#~ msgid "You can receive files over Bluetooth into this folder"
-#~ msgstr "æåäéèèçåææäåæææä"
+#: ../src/logview-filter.ui.h:3
+msgid "Highlight"
+msgstr "éä"
 
-#~ msgid "Please log in as the user guest"
-#~ msgstr "èääèåçå"
+#: ../src/logview-filter.ui.h:4
+msgid "Hide"
+msgstr "éè"
 
-#~ msgid "Only for Bonded and Trusted devices"
-#~ msgstr "äåçåäääçèå"
+#: ../src/logview-filter.ui.h:5
+msgid "Foreground:"
+msgstr "åæï"
+
+#: ../src/logview-filter.ui.h:6
+msgid "Background:"
+msgstr "èæï"
+
+#: ../src/logview-filter.ui.h:7
+msgid "Effect:"
+msgstr "ææï"
+
+#: ../src/logview-gear-menu.ui.h:1
+msgid "Open..."
+msgstr "æå..."
+
+#: ../src/logview-gear-menu.ui.h:2
+msgid "Close"
+msgstr "åé"
+
+#: ../src/logview-gear-menu.ui.h:3
+msgid "Copy"
+msgstr "åå"
+
+#: ../src/logview-gear-menu.ui.h:4
+msgid "Select All"
+msgstr "åé"
+
+#: ../src/logview-gear-menu.ui.h:5
+msgid "Zoom In"
+msgstr "æå"
+
+#: ../src/logview-gear-menu.ui.h:6
+msgid "Zoom Out"
+msgstr "çå"
+
+#: ../src/logview-gear-menu.ui.h:7
+msgid "Normal Size"
+msgstr "åååå"
+
+#: ../src/logview-gear-menu.ui.h:9
+msgid "Show Matches Only"
+msgstr "äæçåéé"
+
+#: ../src/logview-gear-menu.ui.h:10
+msgid "Manage Filters..."
+msgstr "ççèæå..."
+
+#: ../src/logview-findbar.c:163
+msgid "Find previous occurrence of the search string"
+msgstr "åææçåçäçääæåç"
+
+#: ../src/logview-findbar.c:172
+msgid "Find next occurrence of the search string"
+msgstr "åææçåçäçääæåç"
+
+#: ../src/logview-log.c:593
+msgid "Error while uncompressing the GZipped log. The file might be corrupt."
+msgstr "èåçGZippedæåæåçéèãèæäåèåæåã"
+
+#: ../src/logview-log.c:640
+msgid "You don't have enough permissions to read the file."
+msgstr "æææèåçæéèèäæäã"
+
+#: ../src/logview-log.c:655
+msgid "The file is not a regular file or is not a text file."
+msgstr "æääæåèçæäæäæääæææäã"
+
+#: ../src/logview-log.c:737
+msgid "This version of System Log does not support GZipped logs."
+msgstr "èäççæåççæäææGZippedæåã"
+
+#: ../src/logview-loglist.c:315
+msgid "Loading..."
+msgstr "æåèå..."
+
+#: ../src/logview-utils.c:295
+msgid "today"
+msgstr "äå"
+
+#: ../src/logview-utils.c:297
+msgid "yesterday"
+msgstr "æå"
+
+#: ../src/logview-window.c:178 ../src/logview-window.c:354
+#, c-format
+msgid "Search in \"%s\""
+msgstr "åâ%sâäæç"
+
+#. translators: this is part of a label composed with
+#. * a date string, for example "updated today 23:54"
+#.
+#: ../src/logview-window.c:203
+msgid "updated"
+msgstr "åææ"
+
+#: ../src/logview-window.c:322
+#, fuzzy
+msgid "Wrapped"
+msgstr "ååè"
+
+#: ../src/logview-window.c:337
+msgid "No matches found"
+msgstr "ææååéé"
+
+#: ../src/logview-window.c:686
+#, c-format
+msgid "Can't read from \"%s\""
+msgstr "äèäâ%sâèå"
 
-#~ msgid "gtk-help"
-#~ msgstr "gtk-help"
+#: ../src/logview-window.c:1074
+msgid "Open Log"
+msgstr "æåæå"
 
-#~ msgid "User Sharing"
-#~ msgstr "çæåä"
+#: ../src/logview-window.c:1360
+msgid "Could not open the following files:"
+msgstr "æææåäåæäï"