diff --git a/po/ja.po b/po/ja.po
index b332eed0cfc..0ee42e8b8f2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -255,7 +255,7 @@ msgstr "$0 が $1 ($2 が保存) を使用しています"
 
 #: pkg/storaged/dialog.jsx:1346
 msgid "$0 used, $1 total"
-msgstr "利用済 $0 、合計 $1"
+msgstr "利用済 $0、合計 $1"
 
 #: pkg/lib/cockpit-components-plot.jsx:223
 msgid "$0 week"
@@ -971,8 +971,6 @@ msgid "All"
 msgstr "すべて"
 
 #: pkg/storaged/lvm2/create-logical-volume-dialog.jsx:158
-#, fuzzy
-#| msgid "All $0 selected physical volumes are needed for the choosen layout."
 msgid "All $0 selected physical volumes are needed for the chosen layout."
 msgstr "選択したレイアウトには、選択した $0 の物理ボリュームがすべて必要です。"
 
@@ -1464,7 +1462,7 @@ msgstr "キャリア"
 
 #: pkg/storaged/pages.jsx:713
 msgid "Category"
-msgstr "カテゴリ"
+msgstr "カテゴリー"
 
 #: pkg/users/expiration-dialogs.js:115 pkg/users/expiration-dialogs.js:217
 #: pkg/users/shell-dialog.js:78
@@ -1636,7 +1634,7 @@ msgstr "すべてのフィルターの消去"
 
 #: pkg/users/accounts-list.js:341 pkg/users/accounts-list.js:455
 msgid "Clear filter"
-msgstr "フィルタを外す"
+msgstr "フィルターを外す"
 
 #: pkg/shell/nav.jsx:158
 msgid "Clear search"
@@ -2809,7 +2807,7 @@ msgstr "motd を編集する"
 #: pkg/storaged/btrfs/subvolume.jsx:334 pkg/storaged/stratis/filesystem.jsx:170
 #: pkg/storaged/filesystem/filesystem.jsx:100
 msgid "Edit mount point"
-msgstr "マウントポイント 編集"
+msgstr "マウントポイントの編集"
 
 #: pkg/networkmanager/network-main.jsx:161
 msgid "Edit rules and zones"
@@ -3489,7 +3487,7 @@ msgstr "チェック方法"
 
 #: pkg/storaged/dialog.jsx:1367
 msgid "I confirm I want to lose this data forever"
-msgstr ""
+msgstr "このデータが完全に削除されることに同意します"
 
 #: pkg/users/group-create-dialog.js:47 pkg/users/accounts-list.js:230
 #: pkg/users/accounts-list.js:382 pkg/systemd/hwinfo.jsx:291
@@ -3579,7 +3577,7 @@ msgstr "無視"
 
 #: pkg/storaged/dialog.jsx:1302
 msgid "Important data might be deleted:"
-msgstr "重要データが削除されるかもしれない:"
+msgstr "重要なデータが削除される可能性があります:"
 
 #: pkg/metrics/metrics.jsx:816
 msgid "In"
@@ -4262,7 +4260,7 @@ msgstr "ロックされたデータ"
 
 #: pkg/storaged/dialog.jsx:1354
 msgid "Locked encrypted device might contain data"
-msgstr "ロック中暗号化デバイスにデータがあるようです"
+msgstr "ロックされた暗号化デバイスにはデータが含まれている可能性があります"
 
 #: pkg/storaged/jobs-panel.jsx:43
 msgid "Locking $target"
@@ -6531,12 +6529,12 @@ msgstr "ルート"
 
 #: pkg/lib/cockpit-components-table.jsx:270
 msgid "Row expansion"
-msgstr "行拡張"
+msgstr "行の拡張"
 
 #: pkg/lib/cockpit-components-table.jsx:271
 #: pkg/lib/cockpit-components-table.jsx:272
 msgid "Row select"
-msgstr "行選択"
+msgstr "行の選択"
 
 #: pkg/systemd/timer-dialog.jsx:252 pkg/systemd/timer-dialog.jsx:264
 msgid "Run at"
@@ -6627,10 +6625,8 @@ msgid "SSH key isn't a path"
 msgstr "SSH キーはパスではありません"
 
 #: pkg/lib/cockpit-connect-ssh.tsx:468
-#, fuzzy
-#| msgid "SSH key"
 msgid "SSH key login"
-msgstr "SSH キー"
+msgstr "SSH 鍵ログイン"
 
 #: pkg/shell/credentials.jsx:77 pkg/shell/credentials.jsx:93
 #: pkg/shell/topnav.jsx:229
@@ -6774,15 +6770,10 @@ msgid "Select method"
 msgstr "メソッドの選択"
 
 #: pkg/storaged/lvm2/block-logical-volume.jsx:127
-#, fuzzy
-#| msgid ""
-#| "Select the physical volumes that should be used to repair the logical "
-#| "volume. At leat $0 are needed."
 msgid ""
 "Select the physical volumes that should be used to repair the logical "
 "volume. At least $0 are needed."
-msgstr ""
-"論理ボリュームの修復に使用する物理ボリュームを選択します。$0 以上が必要です。"
+msgstr "論理ボリュームの修復に使用する物理ボリュームを選択します。$0 以上が必要です。"
 
 #: pkg/systemd/reporting.jsx:265
 msgid "Send"
@@ -7917,16 +7908,12 @@ msgid "Thinly provisioned LVM2 logical volumes"
 msgstr "シンプロビジョニングされた LVM2 論理ボリューム"
 
 #: pkg/storaged/mdraid/mdraid.jsx:284
-#, fuzzy
-#| msgid ""
-#| "This MDRAID device has no write-intent bitmap. Such a bitmap can reduce "
-#| "sychronization times significantly."
 msgid ""
 "This MDRAID device has no write-intent bitmap. Such a bitmap can reduce "
 "synchronization times significantly."
 msgstr ""
-"この MDRAID デバイスには write-intent ビットマップがありません。このビット"
-"マップを使用すると、同期時間を大幅に短縮できます。"
+"この MDRAID デバイスには write-intent ビットマップがありません。このビットマ"
+"ップを使用すると、同期時間を大幅に短縮できます。"
 
 #: pkg/storaged/nfs/nfs.jsx:111
 msgid "This NFS mount is in use and only its options can be changed."
@@ -8402,16 +8389,10 @@ msgid "Unable to get alert details."
 msgstr "アラート詳細を取得できません。"
 
 #: pkg/lib/cockpit-connect-ssh.tsx:396
-#, fuzzy
-#| msgid ""
-#| "Unable to log in to $0 using SSH key authentication. Please provide the "
-#| "password. You may want to set up your SSH keys for automatic login."
 msgid ""
 "Unable to log in to $0 using SSH key authentication. Please provide the "
 "password."
-msgstr ""
-"SSH キー認証で $0 にログインできません。パスワードを入力してください。SSH "
-"キーを自動ログイン用に設定しておいてください。"
+msgstr "SSH 鍵認証を使用して $0 にログインできません。パスワードを入力してください。"
 
 #: pkg/shell/hosts_dialog.jsx:769
 msgid ""
@@ -8526,10 +8507,8 @@ msgid "Unknown host name"
 msgstr "不明なホスト名"
 
 #: pkg/lib/cockpit-connect-ssh.tsx:125
-#, fuzzy
-#| msgid "Unknown host key"
 msgid "Unknown host: $0"
-msgstr "不明なホストキー"
+msgstr "不明なホスト: $0"
 
 #: pkg/networkmanager/firewall.jsx:477
 msgid "Unknown service name"
@@ -8629,7 +8608,7 @@ msgstr "信用できないホスト"
 
 #: pkg/systemd/overview-cards/systemInformationCard.jsx:129
 msgid "Up since"
-msgstr "$0 より稼働中"
+msgstr "起動時間:"
 
 #: pkg/shell/hosts_dialog.jsx:356
 msgid "Update"
@@ -8681,7 +8660,7 @@ msgstr "ステータスを更新中..."
 
 #: pkg/playground/react-demo-file-upload.tsx:109
 msgid "Upload"
-msgstr "ロード"
+msgstr "アップロード"
 
 #: pkg/systemd/overview-cards/usageCard.jsx:128
 #: pkg/storaged/lvm2/physical-volume.jsx:119
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5f9e0d0bf18..f95a4cd56a8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -969,8 +969,6 @@ msgid "All"
 msgstr "所有"
 
 #: pkg/storaged/lvm2/create-logical-volume-dialog.jsx:158
-#, fuzzy
-#| msgid "All $0 selected physical volumes are needed for the choosen layout."
 msgid "All $0 selected physical volumes are needed for the chosen layout."
 msgstr "所选布局需要所有选定的 $0 物理卷。"
 
@@ -1457,7 +1455,7 @@ msgstr "载体"
 
 #: pkg/storaged/pages.jsx:713
 msgid "Category"
-msgstr "种类"
+msgstr "类别"
 
 #: pkg/users/expiration-dialogs.js:115 pkg/users/expiration-dialogs.js:217
 #: pkg/users/shell-dialog.js:78
@@ -1570,7 +1568,7 @@ msgstr "检查并修复 MDRAID 设备 $target"
 
 #: pkg/storaged/dialog.jsx:1330
 msgid "Checking filesystem usage"
-msgstr "正在检查文件系统使用量"
+msgstr "检查文件系统的使用情况"
 
 #: pkg/storaged/crypto/keyslots.jsx:267
 msgid "Checking for $0 package"
@@ -1622,10 +1620,8 @@ msgid "Clear all filters"
 msgstr "清除所有过滤规则"
 
 #: pkg/users/accounts-list.js:341 pkg/users/accounts-list.js:455
-#, fuzzy
-#| msgid "Clear all filters"
 msgid "Clear filter"
-msgstr "清除所有过滤规则"
+msgstr "清除过滤器"
 
 #: pkg/shell/nav.jsx:158
 msgid "Clear search"
@@ -2118,7 +2114,7 @@ msgstr "创建卷组"
 
 #: pkg/sosreport/sosreport.jsx:507
 msgid "Created"
-msgstr "创建于"
+msgstr "已创建"
 
 #: pkg/storaged/jobs-panel.jsx:76
 msgid "Creating LVM2 volume group $target"
@@ -2509,7 +2505,7 @@ msgstr "设备"
 
 #: pkg/storaged/dialog.jsx:1350 pkg/storaged/dialog.jsx:1358
 msgid "Device contains unrecognized data"
-msgstr "设备含有无法识别的数据"
+msgstr "设备包含无法被识别的数据"
 
 #: pkg/storaged/legacy-vdo/legacy-vdo.jsx:287 pkg/storaged/drive/drive.jsx:132
 #: pkg/storaged/block/other.jsx:62
@@ -3448,7 +3444,7 @@ msgstr "如何检查"
 
 #: pkg/storaged/dialog.jsx:1367
 msgid "I confirm I want to lose this data forever"
-msgstr "我确认我想永远丢失这些数据"
+msgstr "我确认我希望永久删除这些数据"
 
 #: pkg/users/group-create-dialog.js:47 pkg/users/accounts-list.js:230
 #: pkg/users/accounts-list.js:382 pkg/systemd/hwinfo.jsx:291
@@ -4161,7 +4157,7 @@ msgstr "加载单元失败"
 #: pkg/storaged/storaged.jsx:66 pkg/kdump/kdump-view.jsx:438
 #: pkg/metrics/metrics.jsx:1994
 msgid "Loading..."
-msgstr "载入中..."
+msgstr "加载中……"
 
 #: pkg/users/index.html:23
 msgid "Local accounts"
@@ -6147,7 +6143,7 @@ msgstr "删除主机"
 #: pkg/networkmanager/ip-settings.jsx:322
 #: pkg/networkmanager/ip-settings.jsx:394
 msgid "Remove item"
-msgstr "删除条目"
+msgstr "删除项目"
 
 #: pkg/storaged/lvm2/volume-group.jsx:346
 msgid "Remove missing physical volumes?"
@@ -6171,7 +6167,7 @@ msgstr "移除区 $0"
 
 #: pkg/apps/application.jsx:44
 msgid "Removing"
-msgstr "正在移除"
+msgstr "删除"
 
 #: pkg/lib/cockpit-components-install-dialog.jsx:191
 #: pkg/storaged/crypto/keyslots.jsx:258
@@ -6417,7 +6413,7 @@ msgstr "如果 kdump 配置正确，崩溃的结果将作为 $1 存储在 $0 中
 
 #: pkg/systemd/logs.jsx:263
 msgid "Resume"
-msgstr "恢复"
+msgstr "继续"
 
 #: pkg/storaged/block/format-dialog.jsx:203
 msgid "Reuse existing encryption"
@@ -6444,17 +6440,13 @@ msgid "Routes"
 msgstr "路由"
 
 #: pkg/lib/cockpit-components-table.jsx:270
-#, fuzzy
-#| msgid "extension"
 msgid "Row expansion"
-msgstr "扩展"
+msgstr "行扩展"
 
 #: pkg/lib/cockpit-components-table.jsx:271
 #: pkg/lib/cockpit-components-table.jsx:272
-#, fuzzy
-#| msgid "Select"
 msgid "Row select"
-msgstr "选择"
+msgstr "行选择"
 
 #: pkg/systemd/timer-dialog.jsx:252 pkg/systemd/timer-dialog.jsx:264
 msgid "Run at"
@@ -6485,7 +6477,7 @@ msgstr "运行者"
 #: pkg/systemd/services.jsx:696 pkg/systemd/service-details.jsx:458
 #: pkg/storaged/mdraid/mdraid.jsx:297
 msgid "Running"
-msgstr "运行中"
+msgstr "正在运行"
 
 #: pkg/selinux/manifest.json:0
 #: src/appstream/org.cockpit-project.cockpit-selinux.metainfo.xml.in:5
@@ -6543,10 +6535,8 @@ msgid "SSH key isn't a path"
 msgstr "SSH 密钥不是路径"
 
 #: pkg/lib/cockpit-connect-ssh.tsx:468
-#, fuzzy
-#| msgid "SSH key"
 msgid "SSH key login"
-msgstr "SSH 密钥"
+msgstr "SSH 密钥登录"
 
 #: pkg/shell/credentials.jsx:77 pkg/shell/credentials.jsx:93
 #: pkg/shell/topnav.jsx:229
@@ -6687,10 +6677,6 @@ msgid "Select method"
 msgstr "选择方法"
 
 #: pkg/storaged/lvm2/block-logical-volume.jsx:127
-#, fuzzy
-#| msgid ""
-#| "Select the physical volumes that should be used to repair the logical "
-#| "volume. At leat $0 are needed."
 msgid ""
 "Select the physical volumes that should be used to repair the logical "
 "volume. At least $0 are needed."
@@ -6966,14 +6952,10 @@ msgid "Snapshot"
 msgstr "快照"
 
 #: pkg/storaged/btrfs/subvolume.jsx:439
-#, fuzzy
-#| msgid "Snapshot"
 msgid "Snapshot origin"
-msgstr "快照"
+msgstr "快照源"
 
 #: pkg/storaged/btrfs/subvolume.jsx:461
-#, fuzzy
-#| msgid "Snapshot"
 msgid "Snapshots"
 msgstr "快照"
 
@@ -7786,10 +7768,6 @@ msgid "Thinly provisioned LVM2 logical volumes"
 msgstr "精简置备的 LVM2 逻辑卷"
 
 #: pkg/storaged/mdraid/mdraid.jsx:284
-#, fuzzy
-#| msgid ""
-#| "This MDRAID device has no write-intent bitmap. Such a bitmap can reduce "
-#| "sychronization times significantly."
 msgid ""
 "This MDRAID device has no write-intent bitmap. Such a bitmap can reduce "
 "synchronization times significantly."
@@ -8115,7 +8093,7 @@ msgstr "触发器"
 
 #: pkg/metrics/metrics.jsx:1852
 msgid "Troubleshoot"
-msgstr "排错"
+msgstr "故障排除"
 
 #: pkg/networkmanager/networkmanager.jsx:84
 msgid "Troubleshoot…"
@@ -8238,16 +8216,10 @@ msgid "Unable to get alert details."
 msgstr "无法获取警告详情。"
 
 #: pkg/lib/cockpit-connect-ssh.tsx:396
-#, fuzzy
-#| msgid ""
-#| "Unable to log in to $0 using SSH key authentication. Please provide the "
-#| "password. You may want to set up your SSH keys for automatic login."
 msgid ""
 "Unable to log in to $0 using SSH key authentication. Please provide the "
 "password."
-msgstr ""
-"无法使用 SSH 密钥认证登录到 $0 。请提供密码。您可能需要为自动登录设置 SSH 密"
-"钥。"
+msgstr "无法使用 SSH 密钥身份验证登录到 $0。请提供密码。"
 
 #: pkg/shell/hosts_dialog.jsx:769
 msgid ""
@@ -8360,10 +8332,8 @@ msgid "Unknown host name"
 msgstr "未知主机名"
 
 #: pkg/lib/cockpit-connect-ssh.tsx:125
-#, fuzzy
-#| msgid "Unknown host key"
 msgid "Unknown host: $0"
-msgstr "未知主机密钥"
+msgstr "未知主机：$0"
 
 #: pkg/networkmanager/firewall.jsx:477
 msgid "Unknown service name"
@@ -8462,10 +8432,8 @@ msgid "Untrusted host"
 msgstr "不可信的主机"
 
 #: pkg/systemd/overview-cards/systemInformationCard.jsx:129
-#, fuzzy
-#| msgid "Up since $0"
 msgid "Up since"
-msgstr "运行自 $0"
+msgstr "运行时间"
 
 #: pkg/shell/hosts_dialog.jsx:356
 msgid "Update"
@@ -8516,10 +8484,8 @@ msgid "Updating status..."
 msgstr "更新状态 ..."
 
 #: pkg/playground/react-demo-file-upload.tsx:109
-#, fuzzy
-#| msgid "Reload"
 msgid "Upload"
-msgstr "重载"
+msgstr "上传"
 
 #: pkg/systemd/overview-cards/usageCard.jsx:128
 #: pkg/storaged/lvm2/physical-volume.jsx:119
@@ -9354,7 +9320,7 @@ msgstr "忽略失败"
 
 #: pkg/lib/timeformat.ts:60
 msgid "in less than a minute"
-msgstr "一分钟内"
+msgstr "少于一分钟"
 
 #: pkg/shell/shell-modals.jsx:195
 msgid "in most browsers"
@@ -9413,14 +9379,12 @@ msgid "keys"
 msgstr "密钥"
 
 #: pkg/packagekit/manifest.json:0
-#, fuzzy
-#| msgid "patches"
 msgid "kpatch"
-msgstr "补丁"
+msgstr "kpatch"
 
 #: pkg/lib/timeformat.ts:58
 msgid "less than a minute ago"
-msgstr "不到一分钟前"
+msgstr "少于一分钟前"
 
 #: pkg/users/manifest.json:0
 msgid "login"
@@ -9698,8 +9662,6 @@ msgid "shut"
 msgstr "关闭"
 
 #: pkg/storaged/btrfs/subvolume.jsx:465
-#, fuzzy
-#| msgid "Snapshot"
 msgid "snapshot"
 msgstr "快照"
 
@@ -9820,10 +9782,8 @@ msgid "unpartitioned space on $0"
 msgstr "$0 上未分区的空间"
 
 #: pkg/packagekit/manifest.json:0
-#, fuzzy
-#| msgid "No updates"
 msgid "updates"
-msgstr "没有更新"
+msgstr "更新"
 
 #: pkg/metrics/metrics.jsx:114 pkg/users/manifest.json:0
 msgid "user"