summaryrefslogtreecommitdiffstats
path: root/qemu/po/zh_CN.po
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:18:31 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:42:15 +0300
commit437fd90c0250dee670290f9b714253671a990160 (patch)
treeb871786c360704244a07411c69fb58da9ead4a06 /qemu/po/zh_CN.po
parent5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff)
These changes are the raw update to qemu-2.6.
Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'qemu/po/zh_CN.po')
-rw-r--r--qemu/po/zh_CN.po36
1 files changed, 18 insertions, 18 deletions
diff --git a/qemu/po/zh_CN.po b/qemu/po/zh_CN.po
index 2b1d42e97..b55b6f375 100644
--- a/qemu/po/zh_CN.po
+++ b/qemu/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: QEMU 2.2\n"
"Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
-"POT-Creation-Date: 2014-07-31 10:03+0800\n"
+"POT-Creation-Date: 2016-04-18 14:50+0100\n"
"PO-Revision-Date: 2014-07-31 10:00+0800\n"
"Last-Translator: Fam Zheng <famz@redhat.com>\n"
"Language-Team: Chinese <zh@li.org>\n"
@@ -17,70 +17,70 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.4\n"
-#: ui/gtk.c:321
+#: ui/gtk.c:273
msgid " - Press Ctrl+Alt+G to release grab"
msgstr " - 按下 Ctrl+Alt+G 取消捕获"
-#: ui/gtk.c:325
+#: ui/gtk.c:277
msgid " [Paused]"
msgstr " [已暂停]"
-#: ui/gtk.c:1601
+#: ui/gtk.c:1833
msgid "_Pause"
msgstr "暂停(_P)"
-#: ui/gtk.c:1607
+#: ui/gtk.c:1839
msgid "_Reset"
msgstr "重置(_R)"
-#: ui/gtk.c:1610
+#: ui/gtk.c:1842
msgid "Power _Down"
msgstr "关闭电源(_D)"
-#: ui/gtk.c:1616
+#: ui/gtk.c:1848
msgid "_Quit"
msgstr "退出(_Q)"
-#: ui/gtk.c:1692
+#: ui/gtk.c:1940
msgid "_Fullscreen"
msgstr "全屏(_F)"
-#: ui/gtk.c:1702
+#: ui/gtk.c:1954
msgid "Zoom _In"
msgstr "放大(_I)"
-#: ui/gtk.c:1709
+#: ui/gtk.c:1961
msgid "Zoom _Out"
msgstr "缩小(_O)"
-#: ui/gtk.c:1716
+#: ui/gtk.c:1968
msgid "Best _Fit"
msgstr "最合适大小(_F)"
-#: ui/gtk.c:1723
+#: ui/gtk.c:1975
msgid "Zoom To _Fit"
msgstr "缩放以适应大小(_F)"
-#: ui/gtk.c:1729
+#: ui/gtk.c:1981
msgid "Grab On _Hover"
msgstr "鼠标经过时捕获(_H)"
-#: ui/gtk.c:1732
+#: ui/gtk.c:1984
msgid "_Grab Input"
msgstr "捕获输入(_G)"
-#: ui/gtk.c:1761
+#: ui/gtk.c:2013
msgid "Show _Tabs"
msgstr "显示标签页(_T)"
-#: ui/gtk.c:1764
+#: ui/gtk.c:2016
msgid "Detach Tab"
msgstr "分离标签页"
-#: ui/gtk.c:1778
+#: ui/gtk.c:2028
msgid "_Machine"
msgstr "虚拟机(_M)"
-#: ui/gtk.c:1783
+#: ui/gtk.c:2033
msgid "_View"
msgstr "视图(_V)"