From 60c3caff009c43e8096b3ed361630ae7893fdf3a Mon Sep 17 00:00:00 2001 From: Poesty Li Date: Tue, 4 Feb 2025 07:41:32 +0000 Subject: [PATCH 01/19] Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (115 of 115 strings) Translation: FitTrackee/FitTrackee Client - Administration Translate-URL: https://hosted.weblate.org/projects/fittrackee/fittrackee-client-administration/zh_Hans/ --- fittrackee_client/src/locales/zh_Hans/administration.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fittrackee_client/src/locales/zh_Hans/administration.json b/fittrackee_client/src/locales/zh_Hans/administration.json index 840f8fbcd..5f3bde1c9 100644 --- a/fittrackee_client/src/locales/zh_Hans/administration.json +++ b/fittrackee_client/src/locales/zh_Hans/administration.json @@ -6,7 +6,7 @@ "ACTION": "操作", "ACTIVATE_USER_ACCOUNT": "激活账号", "ACTIVE": "活跃", - "ADMIN": "管理员", + "ADMIN": "管理", "ADMINISTRATION": "管理", "ADMIN_RIGHTS_DELETE_USER_ACCOUNT": "添加/移除管理员权限,删除用户账号。", "APPLICATION": "应用", @@ -84,11 +84,11 @@ "UNSUSPEND": "添加评论(非必填)。", "UPDATE_APPEAL": "说明此申诉处理的原因。" }, - "TITLE": "管理", + "TITLE": "审核", "UNRESOLVED_REPORTS_EXIST": "存在未解决的报告。", "VIEW_REPORT": "查看报告" }, - "BACK_TO_ADMIN": "返回管理员", + "BACK_TO_ADMIN": "返回管理", "CONFIRM_SUSPEND_ACCOUNT": "您确定要暂停 {0} 账号吗?", "CONFIRM_SUSPEND_CONTENT": "你确定要暂停报告的内容吗?", "CONFIRM_USER_ACCOUNT_DELETION": "您确定要删除 {0} 账号吗?所有数据将被删除,此操作不可撤销。", From bf103800593225bae28d0e5098d2e474959ab531 Mon Sep 17 00:00:00 2001 From: Poesty Li Date: Tue, 4 Feb 2025 07:47:18 +0000 Subject: [PATCH 02/19] Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (18 of 18 strings) Translation: FitTrackee/FitTrackee Client - Privacy policy Translate-URL: https://hosted.weblate.org/projects/fittrackee/fittrackee-client-privacy-policy/zh_Hans/ --- fittrackee_client/src/locales/zh_Hans/privacy_policy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fittrackee_client/src/locales/zh_Hans/privacy_policy.json b/fittrackee_client/src/locales/zh_Hans/privacy_policy.json index 92f428213..0835fcbb6 100644 --- a/fittrackee_client/src/locales/zh_Hans/privacy_policy.json +++ b/fittrackee_client/src/locales/zh_Hans/privacy_policy.json @@ -21,7 +21,7 @@ "TITLE": "我们如何保护您的信息?" }, "INFORMATION_USAGE": { - "CONTENT": "我们收集的任何信息可能用于提供 **FitTrackee** 的核心功能:\n- GPX 文件用于创建锻炼记录、在地图上显示轨迹(使用 [OpenStreetMap](https://www.openstreetmap.org) 和配置的图块服务器)和图表,生成地图缩略图,计算记录并获取天气数据(如果设置了天气提供程序)。\n- 根据锻炼和评论设置的可见性级别(公开、仅关注者、私密和提到的用户),其他用户可以查看和互动。**请注意,服务器运营团队或管理团队可能会查看受限可见性的内容。**\n您可以关注其他人以在时间线上查看活动。互动需要用户登录。\n- 除用户名、角色、注册日期、关注者和被关注用户数量、是否被暂停以及锻炼次数外,所有个人资料信息均不公开显示。\n- 您提供的电子邮件地址可能用于向您发送信息和通知或确认您的账号修改。", + "CONTENT": "我们收集的任何信息可能用于提供 **FitTrackee** 的核心功能:\n- GPX 文件用于创建锻炼记录、在地图上显示轨迹(使用 [OpenStreetMap](https://www.openstreetmap.org) 和配置的图块服务器)和图表,生成地图缩略图,计算记录并获取天气数据(如果设置了天气提供程序)。\n- 根据锻炼和评论设置的可见性级别(公开、仅关注者、私密和提到的用户),其他用户可以查看和互动。**请注意,服务器运营团队或审核团队可能会查看受限可见性的内容。**\n您可以关注其他人以在时间线上查看活动。互动需要用户登录。\n- 除用户名、角色、注册日期、关注者和被关注用户数量、是否被暂停以及锻炼次数外,所有个人资料信息均不公开显示。\n- 您提供的电子邮件地址可能用于向您发送信息和通知或确认您的账号修改。", "TITLE": "我们将如何使用您的信息?" }, "SITE_USAGE_BY_CHILDREN": { From ab10b28c7eeefb4011e4e9182cd555b3ff27f946 Mon Sep 17 00:00:00 2001 From: Poesty Li Date: Tue, 4 Feb 2025 07:50:13 +0000 Subject: [PATCH 03/19] Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (206 of 206 strings) Translation: FitTrackee/FitTrackee Client - User Translate-URL: https://hosted.weblate.org/projects/fittrackee/fittrackee-client-user/zh_Hans/ --- fittrackee_client/src/locales/zh_Hans/user.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fittrackee_client/src/locales/zh_Hans/user.json b/fittrackee_client/src/locales/zh_Hans/user.json index c8b216234..73ad3def2 100644 --- a/fittrackee_client/src/locales/zh_Hans/user.json +++ b/fittrackee_client/src/locales/zh_Hans/user.json @@ -111,7 +111,7 @@ "INTERFACE": "界面", "LANGUAGE": "语言", "LAST_NAME": "姓氏", - "LATEST_SANCTIONS_RECEIVED": "最新收到的制裁", + "LATEST_SANCTIONS_RECEIVED": "最新收到的处罚", "LOCATION": "位置", "MONDAY": "星期一", "NOTIFICATIONS": { @@ -126,7 +126,7 @@ }, "NOTIFICATIONS_EDITION": "通知偏好编辑", "NOTIFICATION_PREFERENCES": "通知偏好", - "NO_SANCTIONS": "没有制裁", + "NO_SANCTIONS": "没有处罚", "PICTURE": "图片", "PICTURE_EDITION": "图片编辑", "PICTURE_REMOVE": "移除图片", @@ -147,7 +147,7 @@ "user_warning": "警告({date})", "workout_suspension": "锻炼暂停({date})" }, - "SANCTIONS_RECEIVED": "收到的制裁", + "SANCTIONS_RECEIVED": "收到的处罚", "SANCTION_APPEAL": { "APPROVED": "您的上诉已被批准", "IN_PROGRESS": "您的上诉正在处理中", @@ -176,7 +176,7 @@ "BLOCKED-USERS": "已屏蔽用户", "EQUIPMENTS": "设备", "FOLLOW-REQUESTS": "关注请求", - "MODERATION": "管理", + "MODERATION": "审核", "NOTIFICATIONS": "通知", "PICTURE": "图片", "PREFERENCES": "偏好设置", From 2612cd9e4aa747036b79ed4a8492d0f7fea60c80 Mon Sep 17 00:00:00 2001 From: "sam@samr1.net" Date: Wed, 5 Feb 2025 10:10:31 +0100 Subject: [PATCH 04/19] fix Dockerfile-dev --- Dockerfile-dev | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile-dev b/Dockerfile-dev index 62d2226a4..50c25141a 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -17,6 +17,5 @@ RUN . $VIRTUAL_ENV/bin/activate && poetry install --no-interaction --quiet # run fittrackee server and workers COPY ./docker-entrypoint-dev.sh /docker-entrypoint.sh -COPY ./docker/set-admin.sh /usr/bin/set-admin -RUN chmod +x /usr/bin/set-admin && chmod +x /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh ENTRYPOINT [ "/docker-entrypoint.sh" ] \ No newline at end of file From b574d160f449c8f31a1c09d0837ab096e4039514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20J=C4=99drzejczak?= Date: Wed, 5 Feb 2025 22:42:07 +0000 Subject: [PATCH 05/19] Translated using Weblate (Polish) Currently translated at 100.0% (54 of 54 strings) Translation: FitTrackee/FitTrackee Client - API messages Translate-URL: https://hosted.weblate.org/projects/fittrackee/fittrackee-client-api-messages/pl/ --- fittrackee_client/src/locales/pl/api.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fittrackee_client/src/locales/pl/api.json b/fittrackee_client/src/locales/pl/api.json index eaf4c860f..f549b8dd1 100644 --- a/fittrackee_client/src/locales/pl/api.json +++ b/fittrackee_client/src/locales/pl/api.json @@ -3,7 +3,11 @@ "