From nobody Sun May 5 16:20:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574331696; cv=none; d=zoho.com; s=zohoarc; b=igA+awelF2ApbJ0gpvMXvnUIOfN8Dp3R0dIqjDpK2X4cs+ZPzjjsD3o+T2mB2OgThYLVE+f8/q01sUFejhp8tZ8N3ISfad8+WjDEIc2un6IYHHTja+2p7U4QLypeaBoH17nCfJEC1bjAYflyrl6immU/xMvSEDp1nOMTJC6ixWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574331696; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lW8xVmzL8vBpdRtXK5fUmBzaQjt66qwLX1IMvtgTnWA=; b=kRUX0uQ3BmpWou5x0xDRlYRukxvNVkNxbvZybkSZ43xoifqqXXZUJhZlH/li2UH0w1xGzfN2mPT0AQw0T7LBNNAhVTYdHjYFWUFxOZOx0TDAEVlqqOnD/HsOEXxHHy0TQ84c+YJPXApuU4H14eKpUC5arej54IBBrjQm5+UhWWw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574331696808748.8224039672169; Thu, 21 Nov 2019 02:21:36 -0800 (PST) Received: from localhost ([::1]:38408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjag-0003F6-Ih for importer@patchew.org; Thu, 21 Nov 2019 05:21:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42212) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjVk-0007AV-Gd for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXjVj-0007Um-FL for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50741 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iXjVj-0007US-C0 for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:27 -0500 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-123-FekPJS7ONGivcOPnP3jFKw-1; Thu, 21 Nov 2019 05:16:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89953801FCF; Thu, 21 Nov 2019 10:16:23 +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 7CE705DAB0; Thu, 21 Nov 2019 10:16:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8B5061747D; Thu, 21 Nov 2019 11:16:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574331386; 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=lW8xVmzL8vBpdRtXK5fUmBzaQjt66qwLX1IMvtgTnWA=; b=BGjev51dIQFISCf5J1T50YusDKrMdZyn1hqawSGMrF5KrlqYxPIlZjPuaMKlmEFz0bwNn+ 08v9TUHgH2uIT9GnsBrmgAu9mPJqfXkxvA8tTy3eYaEAA8e4Y0mF8y5wxIUAOFUOacGZtX at/PMyyXFweBwKCyrhHRWWLRPUmbu60= From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/3] audio: fix audio recording Date: Thu, 21 Nov 2019 11:16:16 +0100 Message-Id: <20191121101618.29289-2-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.79 on 10.5.11.14 X-MC-Unique: FekPJS7ONGivcOPnP3jFKw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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 , Alistair Francis , =?UTF-8?q?Volker=20R=C3=BCmelin?= , qemu-arm@nongnu.org, Gerd Hoffmann , "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Volker R=C3=BCmelin With current code audio recording with all audio backends except PulseAudio and DirectSound is broken. The generic audio recording buffer management forgot to update the current read position after a read. Fixes: ff095e5231 "audio: api for mixeng code free backends" Signed-off-by: Volker R=C3=BCmelin Reviewed-by: Zolt=C3=A1n K=C5=91v=C3=A1g=C3=B3 Message-id: 2fc947cf-7b42-de68-3f11-cbcf1c096be9@t-online.de Signed-off-by: Gerd Hoffmann --- audio/audio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/audio/audio.c b/audio/audio.c index 7fc3aa9d1637..56fae5504710 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1390,6 +1390,7 @@ void *audio_generic_get_buffer_in(HWVoiceIn *hw, size= _t *size) size_t read =3D hw->pcm_ops->read(hw, hw->buf_emul + hw->pos_emul, read_len); hw->pending_emul +=3D read; + hw->pos_emul =3D (hw->pos_emul + read) % hw->size_emul; if (read < read_len) { break; } --=20 2.18.1 From nobody Sun May 5 16:20:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574331557; cv=none; d=zoho.com; s=zohoarc; b=ROHMtnlhfo415BKCBMm7PuaE6eaprHDR6/kUZd4ASMea5MREV+q+8ocXh2ajkj8oXu7r1gMiiZq5RPyY0xD33v8NOqtXckVp5Gb0K5ZR9hG4dz/WArS2Wl5IPMXh/hcFBAdSI6mYBMRC36fsCpLAajK9KiFMm0+87VXcDMd5JJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574331557; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=AlBLTUfmNbmfVPJn2njrpT5+GfbBLtiHY4uB+NBxM4I=; b=d5iDqyJqCT04KII44S1zKirhiOxsT15bQ2AjcnkG277v8tZw5s0Xn+2EmfXBSnqL9QBwb6Xn48K94bnKyU7xnnPz0ufwllnzw4KIiRk8uopVkjnTcKnh9JXv4iZO4+bCBH/gezuad3Ec3DRgiOPv8ZuZPBeEWVwaUkeJgHImQWk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574331557599558.1477810557067; Thu, 21 Nov 2019 02:19:17 -0800 (PST) Received: from localhost ([::1]:38388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjYQ-0000S8-RF for importer@patchew.org; Thu, 21 Nov 2019 05:19:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42251) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjVl-0007Bm-Hn 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-0007Vj-GW for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:29 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36197 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-0007V1-CD for qemu-devel@nongnu.org; Thu, 21 Nov 2019 05:16:28 -0500 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-74-yrZ0f6DNNLe4rc9OJdIPWA-1; Thu, 21 Nov 2019 05:16:24 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04213107ACC4; Thu, 21 Nov 2019 10:16:23 +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 89A2452FC5; Thu, 21 Nov 2019 10:16:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 93FC317536; Thu, 21 Nov 2019 11:16:18 +0100 (CET) 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:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AlBLTUfmNbmfVPJn2njrpT5+GfbBLtiHY4uB+NBxM4I=; b=IE30K6vUqxYEWJIoEm3MxrPJe3ccnw1bl8FunKeEflqcPOV9bdGNpt7a9mEmkAaooUHOrX aZ75MA+DoJOcuY05wbr8Z3/TCiEYzXecvlBaxddlvXbHNEHie4LRTZM1GIZ4BYi/UtBUYL p4oFV+pmkts41V9om8W8cUmlaPO9kDc= From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/3] display: xlnx_dp: Provide sufficient bytes for silent audio channel Date: Thu, 21 Nov 2019 11:16:17 +0100 Message-Id: <20191121101618.29289-3-kraxel@redhat.com> In-Reply-To: <20191121101618.29289-1-kraxel@redhat.com> References: <20191121101618.29289-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: yrZ0f6DNNLe4rc9OJdIPWA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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 , Sai Pavan Boddu , Alistair Francis , qemu-arm@nongnu.org, Gerd Hoffmann , "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Sai Pavan Boddu Fill the audio channel with required number of bytes to cover the elapsed time. This prevents rate control reset, and avoids debug prints like below log: Resetting rate control (65692 samples) ... Resetting rate control (65721 samples) ... Signed-off-by: Sai Pavan Boddu Reviewed-by: Alistair Francis Message-id: 1573833408-2388-1-git-send-email-sai.pavan.boddu@xilinx.com Signed-off-by: Gerd Hoffmann --- hw/display/xlnx_dp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index fde3b21ea5f4..705844379794 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -394,13 +394,18 @@ static void xlnx_dp_audio_callback(void *opaque, int = avail) written =3D AUD_write(s->amixer_output_stream, &s->out_buffer[s->data_ptr], s->byte_left); } else { + int len_to_copy; /* * There is nothing to play.. We don't have any data! Fill the * buffer with zero's and send it. */ written =3D 0; - memset(s->out_buffer, 0, 1024); - AUD_write(s->amixer_output_stream, s->out_buffer, 1024); + while (avail) { + len_to_copy =3D MIN(AUD_CHBUF_MAX_DEPTH, avail); + memset(s->out_buffer, 0, len_to_copy); + avail -=3D AUD_write(s->amixer_output_stream, s->out_buffe= r, + len_to_copy); + } } } else { written =3D AUD_write(s->amixer_output_stream, --=20 2.18.1 From nobody Sun May 5 16:20:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574331557; cv=none; d=zoho.com; s=zohoarc; b=EKpElDm0ldGrpI/0u4QEGOU8YJZIwdRMF2ux/nL93zEKkshsS9IIQXFzt7hYkae1S4K8B1VCge9g9JgcnyZsSbkgWWRYPs++ztUaKUmek0aZesrWndByDf/3GOOsezlnPKu/OMQ9MeK5njiwDocGAH5WBM9wtJ0C5wzAGjv6hEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574331557; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YfCpqtfoaFd+zElyHybnucVvilp1YJOV0xQeGdTYA5c=; b=myobv8xoILpH4KQOSo1VDsfNOB+NdEtrO7JhMKmI1dZ8bZA2MXy/VfT3FFBo5Kp1+uUIkDeeydwDvo4OkH9m6YlE5aGhRQUUH8+2sMCtef+9z2cOnlK2nFuQeCDJ6jdtR99ypztzPZ+1MrQ8ylH1Oid+j0FdnT1kkBGq/Yj4Iks= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574331557607811.8117998878193; Thu, 21 Nov 2019 02:19:17 -0800 (PST) Received: from localhost ([::1]:38386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjYR-0000Ri-AS for importer@patchew.org; Thu, 21 Nov 2019 05:19:15 -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 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) 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= 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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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, Displa= yOptions *opts) setlocale(LC_MESSAGES, ""); setlocale(LC_CTYPE, "C.UTF-8"); bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR); + bind_textdomain_codeset("qemu", "UTF-8"); textdomain("qemu"); =20 window_display =3D 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 "=E5=88=86=E7=A6=BB=E6=A0=87=E7=AD=BE=E9=A1=B5" =20 msgid "Show Menubar" -msgstr "" +msgstr "=E6=98=BE=E7=A4=BA=E8=8F=9C=E5=8D=95=E6=A0=8F" =20 msgid "_Machine" msgstr "=E8=99=9A=E6=8B=9F=E6=9C=BA(_M)" --=20 2.18.1