Merge branch 'dev' into clients-pops

messages/de-DE.json

@@ -1129,4 +1129,4 @@
     "dark": "dunkel",
     "system": "system",
     "theme": "Design"
-}
+}

messages/zh-CN.json

@@ -12,7 +12,7 @@
     "componentsErrorNoMember": "您目前不是任何组织的成员。",
     "welcome": "欢迎使用 Pangolin",
     "componentsCreateOrg": "创建组织",
-    "componentsMember": "{count, plural, =0 {您目前不是任何组织的成员。} other {你已加入 # 个组织。}}.",
+    "componentsMember": "You're a member of {count, plural, =0 {no organization} =1 {one organization} other {# organizations}}.",
     "componentsInvalidKey": "检测到无效或过期的许可证密钥。按照许可证条款操作以继续使用所有功能。",
     "dismiss": "忽略",
     "componentsLicenseViolation": "许可证超限：该服务器使用了 {usedSites} 个站点，已超过授权的 {maxSites} 个。请遵守许可证条款以继续使用全部功能。",
@@ -1102,7 +1102,7 @@
     "containerNetworks": "网络",
     "containerHostnameIp": "主机名/IP",
     "containerLabels": "标签",
-    "containerLabelsCount": "{count} 个标签",
+    "containerLabelsCount": "{count} label{s,plural,one{} other{s}}",
     "containerLabelsTitle": "容器标签",
     "containerLabelEmpty": "<empty>",
     "containerPorts": "端口",
@@ -1114,7 +1114,7 @@
     "showStoppedContainers": "显示已停止的容器",
     "noContainersFound": "未找到容器。请确保Docker容器正在运行。",
     "searchContainersPlaceholder": "在 {count} 个容器中搜索...",
-    "searchResultsCount": "{count} 个结果",
+    "searchResultsCount": "{count} result{s,plural,one{} other{s}}",
     "filters": "筛选器",
     "filterOptions": "过滤器选项",
     "filterPorts": "端口",
@@ -1129,4 +1129,4 @@
     "dark": "深色",
     "system": "系统",
     "theme": "主题"
-}
+}