From patchwork Thu Nov 21 10:16:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 11256057 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39ABE14DB for ; Thu, 21 Nov 2019 10:18:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FB5A206CB for ; Thu, 21 Nov 2019 10:18:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="egZK3IRz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FB5A206CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:38386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjY2-0000Ri-Kp for patchwork-qemu-devel@patchwork.kernel.org; Thu, 21 Nov 2019 05:18:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42249) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjVl-0007Bj-GC for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXjVk-0007VT-Cm for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:29 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59426 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iXjVk-0007Uy-4g for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574331387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YfCpqtfoaFd+zElyHybnucVvilp1YJOV0xQeGdTYA5c=; b=egZK3IRzVxaYHPt5Wft14VpBfyoP3TU4KGD4KvFweBJ06roECpt7UfcBrUsvl3hh/ne58E s8HqNg8vUuHvE1OBRhA/uqiKyzqpeF+M10i+capcPkJgWQZDc7fimYEqhPnX5GSJwUwHtd fG9zjXe1KX3ZQ3ABZw0mgfcy88lrn3o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-7IQ6cPg5MVefhgO7UnPu9g-1; Thu, 21 Nov 2019 05:16:24 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B594DBA6; Thu, 21 Nov 2019 10:16:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-67.ams2.redhat.com [10.36.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D4D0101F6CE; Thu, 21 Nov 2019 10:16:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9D7E59D45; Thu, 21 Nov 2019 11:16:18 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/3] ui/gtk: fix gettext message's charset. Date: Thu, 21 Nov 2019 11:16:18 +0100 Message-Id: <20191121101618.29289-4-kraxel@redhat.com> In-Reply-To: <20191121101618.29289-1-kraxel@redhat.com> References: <20191121101618.29289-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 7IQ6cPg5MVefhgO7UnPu9g-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , yanminhui , Alistair Francis , qemu-arm@nongnu.org, Gerd Hoffmann , "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: yanminhui Signed-off-by: yanminhui Message-Id: <20191116031037.1207-1-yanminhui163@163.com> Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 1 + po/zh_CN.po | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/gtk.c b/ui/gtk.c index 2f23922afc6a..692ccc7bbb90 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2215,6 +2215,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts) setlocale(LC_MESSAGES, ""); setlocale(LC_CTYPE, "C.UTF-8"); bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR); + bind_textdomain_codeset("qemu", "UTF-8"); textdomain("qemu"); window_display = gtk_widget_get_display(s->window); diff --git a/po/zh_CN.po b/po/zh_CN.po index b25e8e3c0207..38de6a4f2a7f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -66,7 +66,7 @@ msgid "Detach Tab" msgstr "分离标签页" msgid "Show Menubar" -msgstr "" +msgstr "显示菜单栏" msgid "_Machine" msgstr "虚拟机(_M)"