* [PATCH] Update Simplified Chinese translation
@ 2020-02-23 11:12 srb12345
2020-02-25 0:56 ` Samuel Holland
0 siblings, 1 reply; 15+ messages in thread
From: srb12345 @ 2020-02-23 11:12 UTC (permalink / raw)
To: wireguard
From: LilligantMatsuri <srb12345@vip.qq.com>
Signed-off-by: LilligantMatsuri <srb12345@vip.qq.com>
---
app/src/main/res/values-zh-rCN/strings.xml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3360dae..97e871a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,21 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<plurals name="delete_error">
+ <item quantity="one">无法删除 %d 项:%s</item>
<item quantity="other">无法删除 %d 项:%s</item>
</plurals>
<plurals name="delete_success">
+ <item quantity="one">删除了 %d 项</item>
<item quantity="other">删除了 %d 项</item>
</plurals>
<plurals name="delete_title">
+ <item quantity="one">已选择 %d 项</item>
<item quantity="other">已选择 %d 项</item>
</plurals>
<plurals name="import_partial_success">
+ <item quantity="one">导入了 %d 项,读取到 %d 项</item>
<item quantity="other">导入了 %d 项,读取到 %d 项</item>
</plurals>
<plurals name="import_total_success">
+ <item quantity="one">导入了 %d 项</item>
<item quantity="other">导入了 %d 项</item>
</plurals>
<plurals name="set_excluded_applications">
+ <item quantity="one">%d 个排除应用</item>
<item quantity="other">%d 个排除应用</item>
</plurals>
<string name="add_peer">添加节点</string>
@@ -38,7 +44,7 @@
<string name="bad_config_reason_unknown_attribute">属性未知</string>
<string name="bad_config_reason_unknown_section">节未知</string>
<string name="bad_config_reason_value_out_of_range">数值超出范围</string>
- <string name="bad_extension_error">文件扩展名必须为 .conf 或 .zip</string>
+ <string name="bad_extension_error">扩展名必须为 .conf 或 .zip</string>
<string name="cancel">取消</string>
<string name="config_delete_error">无法删除配置 “%s”</string>
<string name="config_exists_error">“%s” 的配置已存在</string>
@@ -60,7 +66,7 @@
<string name="dark_theme_summary_on">正在使用暗色(黑夜)主题</string>
<string name="dark_theme_title">使用暗色主题</string>
<string name="delete">删除</string>
- <string name="deselect_all">全部取消</string>
+ <string name="toggle_all">反选</string>
<string name="dns_servers">DNS 服务器</string>
<string name="edit">编辑</string>
<string name="endpoint">对端地址</string>
--
2.24.1.windows.2
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-23 11:12 [PATCH] Update Simplified Chinese translation srb12345
@ 2020-02-25 0:56 ` Samuel Holland
2020-02-25 8:13 ` Eiji Tanioka
0 siblings, 1 reply; 15+ messages in thread
From: Samuel Holland @ 2020-02-25 0:56 UTC (permalink / raw)
To: srb12345, wireguard
On 2/23/20 5:12 AM, srb12345@vip.qq.com wrote:
> From: LilligantMatsuri <srb12345@vip.qq.com>
>
> Signed-off-by: LilligantMatsuri <srb12345@vip.qq.com>
> ---
> app/src/main/res/values-zh-rCN/strings.xml | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
> index 3360dae..97e871a 100644
> --- a/app/src/main/res/values-zh-rCN/strings.xml
> +++ b/app/src/main/res/values-zh-rCN/strings.xml
> @@ -1,21 +1,27 @@
> <?xml version="1.0" encoding="utf-8"?>
> <resources>
> <plurals name="delete_error">
> + <item quantity="one">无法删除 %d 项:%s</item>
> <item quantity="other">无法删除 %d 项:%s</item>
These look to be the same as the "other" case. Additional quantity items are
only needed if they are different:
https://developer.android.com/guide/topics/resources/string-resource#plurals-item-element
> </plurals>
> <plurals name="delete_success">
> + <item quantity="one">删除了 %d 项</item>
> <item quantity="other">删除了 %d 项</item>
> </plurals>
> <plurals name="delete_title">
> + <item quantity="one">已选择 %d 项</item>
> <item quantity="other">已选择 %d 项</item>
> </plurals>
> <plurals name="import_partial_success">
> + <item quantity="one">导入了 %d 项,读取到 %d 项</item>
> <item quantity="other">导入了 %d 项,读取到 %d 项</item>
> </plurals>
> <plurals name="import_total_success">
> + <item quantity="one">导入了 %d 项</item>
> <item quantity="other">导入了 %d 项</item>
> </plurals>
> <plurals name="set_excluded_applications">
> + <item quantity="one">%d 个排除应用</item>
> <item quantity="other">%d 个排除应用</item>
> </plurals>
> <string name="add_peer">添加节点</string>
> @@ -38,7 +44,7 @@
> <string name="bad_config_reason_unknown_attribute">属性未知</string>
> <string name="bad_config_reason_unknown_section">节未知</string>
> <string name="bad_config_reason_value_out_of_range">数值超出范围</string>
> - <string name="bad_extension_error">文件扩展名必须为 .conf 或 .zip</string>
> + <string name="bad_extension_error">扩展名必须为 .conf 或 .zip</string>
> <string name="cancel">取消</string>
> <string name="config_delete_error">无法删除配置 “%s”</string>
> <string name="config_exists_error">“%s” 的配置已存在</string>
> @@ -60,7 +66,7 @@
> <string name="dark_theme_summary_on">正在使用暗色(黑夜)主题</string>
> <string name="dark_theme_title">使用暗色主题</string>
> <string name="delete">删除</string>
> - <string name="deselect_all">全部取消</string>
> + <string name="toggle_all">反选</string>
> <string name="dns_servers">DNS 服务器</string>
> <string name="edit">编辑</string>
> <string name="endpoint">对端地址</string>
>
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-25 0:56 ` Samuel Holland
@ 2020-02-25 8:13 ` Eiji Tanioka
2020-02-26 2:56 ` Samuel Holland
0 siblings, 1 reply; 15+ messages in thread
From: Eiji Tanioka @ 2020-02-25 8:13 UTC (permalink / raw)
To: Samuel Holland, wireguard
Hi Samuel.
I already translated in Japanese, but I didn't concern about plurals.
Japanese doesn't have plurals, so does "values-ja/strings.xml" needs these fix?
- remove plurals
- add string resource that have same "name" attribute as plurals
Regards,
2020年2月25日(火) 9:58 Samuel Holland <samuel@sholland.org>:
>
> On 2/23/20 5:12 AM, srb12345@vip.qq.com wrote:
> > From: LilligantMatsuri <srb12345@vip.qq.com>
> >
> > Signed-off-by: LilligantMatsuri <srb12345@vip.qq.com>
> > ---
> > app/src/main/res/values-zh-rCN/strings.xml | 10 ++++++++--
> > 1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
> > index 3360dae..97e871a 100644
> > --- a/app/src/main/res/values-zh-rCN/strings.xml
> > +++ b/app/src/main/res/values-zh-rCN/strings.xml
> > @@ -1,21 +1,27 @@
> > <?xml version="1.0" encoding="utf-8"?>
> > <resources>
> > <plurals name="delete_error">
> > + <item quantity="one">无法删除 %d 项:%s</item>
> > <item quantity="other">无法删除 %d 项:%s</item>
>
> These look to be the same as the "other" case. Additional quantity items are
> only needed if they are different:
>
> https://developer.android.com/guide/topics/resources/string-resource#plurals-item-element
>
> > </plurals>
> > <plurals name="delete_success">
> > + <item quantity="one">删除了 %d 项</item>
> > <item quantity="other">删除了 %d 项</item>
> > </plurals>
> > <plurals name="delete_title">
> > + <item quantity="one">已选择 %d 项</item>
> > <item quantity="other">已选择 %d 项</item>
> > </plurals>
> > <plurals name="import_partial_success">
> > + <item quantity="one">导入了 %d 项,读取到 %d 项</item>
> > <item quantity="other">导入了 %d 项,读取到 %d 项</item>
> > </plurals>
> > <plurals name="import_total_success">
> > + <item quantity="one">导入了 %d 项</item>
> > <item quantity="other">导入了 %d 项</item>
> > </plurals>
> > <plurals name="set_excluded_applications">
> > + <item quantity="one">%d 个排除应用</item>
> > <item quantity="other">%d 个排除应用</item>
> > </plurals>
> > <string name="add_peer">添加节点</string>
> > @@ -38,7 +44,7 @@
> > <string name="bad_config_reason_unknown_attribute">属性未知</string>
> > <string name="bad_config_reason_unknown_section">节未知</string>
> > <string name="bad_config_reason_value_out_of_range">数值超出范围</string>
> > - <string name="bad_extension_error">文件扩展名必须为 .conf 或 .zip</string>
> > + <string name="bad_extension_error">扩展名必须为 .conf 或 .zip</string>
> > <string name="cancel">取消</string>
> > <string name="config_delete_error">无法删除配置 “%s”</string>
> > <string name="config_exists_error">“%s” 的配置已存在</string>
> > @@ -60,7 +66,7 @@
> > <string name="dark_theme_summary_on">正在使用暗色(黑夜)主题</string>
> > <string name="dark_theme_title">使用暗色主题</string>
> > <string name="delete">删除</string>
> > - <string name="deselect_all">全部取消</string>
> > + <string name="toggle_all">反选</string>
> > <string name="dns_servers">DNS 服务器</string>
> > <string name="edit">编辑</string>
> > <string name="endpoint">对端地址</string>
> >
>
> _______________________________________________
> WireGuard mailing list
> WireGuard@lists.zx2c4.com
> https://lists.zx2c4.com/mailman/listinfo/wireguard
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-25 8:13 ` Eiji Tanioka
@ 2020-02-26 2:56 ` Samuel Holland
2020-02-26 3:10 ` Eiji Tanioka
2020-02-26 3:44 ` Vasili Pupkin
0 siblings, 2 replies; 15+ messages in thread
From: Samuel Holland @ 2020-02-26 2:56 UTC (permalink / raw)
To: Eiji Tanioka, wireguard
On 2/25/20 2:13 AM, Eiji Tanioka wrote:
> Hi Samuel.
>
> I already translated in Japanese, but I didn't concern about plurals.
>
> Japanese doesn't have plurals, so does "values-ja/strings.xml" needs these fix?
> - remove plurals
> - add string resource that have same "name" attribute as plurals
Resources that have <plural> tags in the untranslated XML should use <plural> in
translations as well. However, the only <item> tag inside them should be
"other". (It should look like the Chinese translation did before this patch.)
So the only thing to fix is removing the <item quantity="one"> tags.
Thanks,
Samuel
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-26 2:56 ` Samuel Holland
@ 2020-02-26 3:10 ` Eiji Tanioka
2020-02-26 3:44 ` Vasili Pupkin
1 sibling, 0 replies; 15+ messages in thread
From: Eiji Tanioka @ 2020-02-26 3:10 UTC (permalink / raw)
To: Samuel Holland, wireguard
Thanks!
I will fix it as told.
2020年2月26日(水) 11:56 Samuel Holland <samuel@sholland.org>:
>
> On 2/25/20 2:13 AM, Eiji Tanioka wrote:
> > Hi Samuel.
> >
> > I already translated in Japanese, but I didn't concern about plurals.
> >
> > Japanese doesn't have plurals, so does "values-ja/strings.xml" needs these fix?
> > - remove plurals
> > - add string resource that have same "name" attribute as plurals
>
> Resources that have <plural> tags in the untranslated XML should use <plural> in
> translations as well. However, the only <item> tag inside them should be
> "other". (It should look like the Chinese translation did before this patch.)
>
> So the only thing to fix is removing the <item quantity="one"> tags.
>
> Thanks,
> Samuel
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-26 2:56 ` Samuel Holland
2020-02-26 3:10 ` Eiji Tanioka
@ 2020-02-26 3:44 ` Vasili Pupkin
2020-02-26 3:59 ` Samuel Holland
1 sibling, 1 reply; 15+ messages in thread
From: Vasili Pupkin @ 2020-02-26 3:44 UTC (permalink / raw)
To: Samuel Holland, wireguard
On 26.02.2020 5:56, Samuel Holland wrote:
> On 2/25/20 2:13 AM, Eiji Tanioka wrote:
>> Hi Samuel.
>>
>> I already translated in Japanese, but I didn't concern about plurals.
>>
>> Japanese doesn't have plurals, so does "values-ja/strings.xml" needs these fix?
>> - remove plurals
>> - add string resource that have same "name" attribute as plurals
> Resources that have <plural> tags in the untranslated XML should use <plural> in
> translations as well. However, the only <item> tag inside them should be
> "other". (It should look like the Chinese translation did before this patch.)
>
> So the only thing to fix is removing the <item quantity="one"> tags.
It seams that russian translation is very basic and not utilize
quantity="two" and quantity="few" forms, without them some plurals reads
odd. Do you need help fixing it or it is done on purpose?
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-26 3:44 ` Vasili Pupkin
@ 2020-02-26 3:59 ` Samuel Holland
2020-02-29 7:00 ` Vasili Pupkin
0 siblings, 1 reply; 15+ messages in thread
From: Samuel Holland @ 2020-02-26 3:59 UTC (permalink / raw)
To: Vasili Pupkin, wireguard
On 2/25/20 9:44 PM, Vasili Pupkin wrote:
> On 26.02.2020 5:56, Samuel Holland wrote:
>> On 2/25/20 2:13 AM, Eiji Tanioka wrote:
>>> Hi Samuel.
>>>
>>> I already translated in Japanese, but I didn't concern about plurals.
>>>
>>> Japanese doesn't have plurals, so does "values-ja/strings.xml" needs these fix?
>>> - remove plurals
>>> - add string resource that have same "name" attribute as plurals
>> Resources that have <plural> tags in the untranslated XML should use <plural> in
>> translations as well. However, the only <item> tag inside them should be
>> "other". (It should look like the Chinese translation did before this patch.)
>>
>> So the only thing to fix is removing the <item quantity="one"> tags.
>
> It seams that russian translation is very basic and not utilize quantity="two"
> and quantity="few" forms, without them some plurals reads odd. Do you need help
> fixing it or it is done on purpose?
I don't think it was done on purpose; likely the translator was unaware of the
additional options for quantity in <item> tags. I am happy to merge patches
improving the translation (which is really up to your judgement, since I don't
speak any of these languages).
Thanks,
Samuel
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-26 3:59 ` Samuel Holland
@ 2020-02-29 7:00 ` Vasili Pupkin
2020-02-29 8:35 ` Eiji Tanioka
0 siblings, 1 reply; 15+ messages in thread
From: Vasili Pupkin @ 2020-02-29 7:00 UTC (permalink / raw)
To: Samuel Holland, wireguard
On 26.02.2020 6:59, Samuel Holland wrote:
> On 2/25/20 9:44 PM, Vasili Pupkin wrote:
>> It seams that russian translation is very basic and not utilize
>> quantity="two"
>> and quantity="few" forms, without them some plurals reads odd. Do you need help
>> fixing it or it is done on purpose?
> I don't think it was done on purpose; likely the translator was unaware of the
> additional options for quantity in <item> tags. I am happy to merge patches
> improving the translation (which is really up to your judgement, since I don't
> speak any of these languages).
Have you received the patch?
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-29 7:00 ` Vasili Pupkin
@ 2020-02-29 8:35 ` Eiji Tanioka
2020-02-29 8:54 ` Jason A. Donenfeld
[not found] ` <5428f486-49cd-0321-de5b-9ef6ca3e8dad@gmail.com>
0 siblings, 2 replies; 15+ messages in thread
From: Eiji Tanioka @ 2020-02-29 8:35 UTC (permalink / raw)
To: wireguard
Hi Vasili!
Did you send patch to ML?
If so, I think that your patch is in the moderation queue. I had met
same situation when sending my patch because of body size (over 40
KB).
I think it's okay if you wait.
Regards,
2020年2月29日(土) 16:03 Vasili Pupkin <diggest@gmail.com>:
>
> On 26.02.2020 6:59, Samuel Holland wrote:
> > On 2/25/20 9:44 PM, Vasili Pupkin wrote:
> >> It seams that russian translation is very basic and not utilize
> >> quantity="two"
> >> and quantity="few" forms, without them some plurals reads odd. Do you need help
> >> fixing it or it is done on purpose?
> > I don't think it was done on purpose; likely the translator was unaware of the
> > additional options for quantity in <item> tags. I am happy to merge patches
> > improving the translation (which is really up to your judgement, since I don't
> > speak any of these languages).
>
> Have you received the patch?
> _______________________________________________
> WireGuard mailing list
> WireGuard@lists.zx2c4.com
> https://lists.zx2c4.com/mailman/listinfo/wireguard
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-02-29 8:35 ` Eiji Tanioka
@ 2020-02-29 8:54 ` Jason A. Donenfeld
[not found] ` <5428f486-49cd-0321-de5b-9ef6ca3e8dad@gmail.com>
1 sibling, 0 replies; 15+ messages in thread
From: Jason A. Donenfeld @ 2020-02-29 8:54 UTC (permalink / raw)
To: Eiji Tanioka; +Cc: WireGuard mailing list
[-- Attachment #1.1: Type: text/plain, Size: 1446 bytes --]
I see no patch caught in the queue. Try again?
On Sat, Feb 29, 2020, 16:36 Eiji Tanioka <tanioka404@gmail.com> wrote:
> Hi Vasili!
>
> Did you send patch to ML?
> If so, I think that your patch is in the moderation queue. I had met
> same situation when sending my patch because of body size (over 40
> KB).
>
> I think it's okay if you wait.
>
> Regards,
>
> 2020年2月29日(土) 16:03 Vasili Pupkin <diggest@gmail.com>:
>
> >
> > On 26.02.2020 6:59, Samuel Holland wrote:
> > > On 2/25/20 9:44 PM, Vasili Pupkin wrote:
> > >> It seams that russian translation is very basic and not utilize
> > >> quantity="two"
> > >> and quantity="few" forms, without them some plurals reads odd. Do you
> need help
> > >> fixing it or it is done on purpose?
> > > I don't think it was done on purpose; likely the translator was
> unaware of the
> > > additional options for quantity in <item> tags. I am happy to merge
> patches
> > > improving the translation (which is really up to your judgement, since
> I don't
> > > speak any of these languages).
> >
> > Have you received the patch?
> > _______________________________________________
> > WireGuard mailing list
> > WireGuard@lists.zx2c4.com
> > https://lists.zx2c4.com/mailman/listinfo/wireguard
> _______________________________________________
> WireGuard mailing list
> WireGuard@lists.zx2c4.com
> https://lists.zx2c4.com/mailman/listinfo/wireguard
>
[-- Attachment #1.2: Type: text/html, Size: 2346 bytes --]
[-- Attachment #2: Type: text/plain, Size: 148 bytes --]
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
[not found] ` <5428f486-49cd-0321-de5b-9ef6ca3e8dad@gmail.com>
@ 2020-03-01 6:53 ` Eiji Tanioka
2020-03-01 7:00 ` Jason A. Donenfeld
0 siblings, 1 reply; 15+ messages in thread
From: Eiji Tanioka @ 2020-03-01 6:53 UTC (permalink / raw)
To: Vasili Pupkin; +Cc: wireguard
Why don't you use `git format-patch`, `git send-email` and send to ML?
In "Source Code Repositories and Official Projects" page (
https://www.wireguard.com/repositories/ ), wireguard-android requires
`git send-email` and send to ML.
And Samuel Holland is not the only committer of wireguard-android,
other committer in ML can review your patch and apply source tree.
If you use required format, your patch will accept more quickly, I think.
Bes Regards,
Eiji Tanioka
2020年2月29日(土) 21:55 Vasili Pupkin <diggest@gmail.com>:
>
> On 29.02.2020 11:35, Eiji Tanioka wrote:
> > Hi Vasili!
> >
> > Did you send patch to ML?
> > If so, I think that your patch is in the moderation queue. I had met
> > same situation when sending my patch because of body size (over 40
> > KB).
> >
> > I think it's okay if you wait.
>
> No. I've just sent it to Samuel Holland to his email only. It's not a
> git patch, just a simple diff patch to the russian language strings,
> without the authorship.
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-03-01 6:53 ` Eiji Tanioka
@ 2020-03-01 7:00 ` Jason A. Donenfeld
0 siblings, 0 replies; 15+ messages in thread
From: Jason A. Donenfeld @ 2020-03-01 7:00 UTC (permalink / raw)
To: Vasili Pupkin; +Cc: WireGuard mailing list
2020年2月29日(土) 21:55 Vasili Pupkin <diggest@gmail.com>:
> No. I've just sent it to Samuel Holland to his email only. It's not a
> git patch, just a simple diff patch to the russian language strings,
> without the authorship.
Please keep your replies and patches on the mailing list.
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
2020-03-12 11:40 srb12345
@ 2020-03-12 11:47 ` Harsh Shandilya
0 siblings, 0 replies; 15+ messages in thread
From: Harsh Shandilya @ 2020-03-12 11:47 UTC (permalink / raw)
To: srb12345; +Cc: wireguard
On Thu, 12 Mar 2020 at 17:13, <srb12345@vip.qq.com> wrote:
>
> From: LilligantMatsuri <srb12345@vip.qq.com>
>
> Signed-off-by: LilligantMatsuri <srb12345@vip.qq.com>
> ---
> ui/src/main/res/values-zh-rCN/strings.xml | 40 ++++++++++++++---------
> 1 file changed, 25 insertions(+), 15 deletions(-)
>
> diff --git a/ui/src/main/res/values-zh-rCN/strings.xml b/ui/src/main/res/values-zh-rCN/strings.xml
> index c8175f1..d3243f9 100644
> --- a/ui/src/main/res/values-zh-rCN/strings.xml
> +++ b/ui/src/main/res/values-zh-rCN/strings.xml
> @@ -20,7 +20,7 @@
> </plurals>
> <string name="add_peer">添加节点</string>
> <string name="addresses">局域网 IP 地址</string>
> - <string name="allowed_ips">允许的 IP 地址(段)</string>
> + <string name="allowed_ips">路由的 IP 地址(段)</string>
> <string name="app_name">WireGuard</string>
> <string name="bad_config_context">%1$s 的 %2$s 字段</string>
> <string name="bad_config_context_top_level">%s</string>
> @@ -49,7 +49,7 @@
> <string name="config_save_success">已保存 “%s” 的配置</string>
> <string name="create_activity_title">创建 WireGuard 隧道</string>
> <string name="create_bin_dir_error">无法创建本地二进制文件目录</string>
> - <string name="create_empty">手动配置</string>
> + <string name="create_empty">手动创建</string>
> <string name="create_from_file">导入配置或压缩包</string>
> <string name="create_from_qr_code">扫描二维码</string>
> <string name="create_output_dir_error">无法创建输出目录</string>
> @@ -63,12 +63,12 @@
> <string name="toggle_all">反选</string>
> <string name="dns_servers">DNS 服务器</string>
> <string name="edit">编辑</string>
> - <string name="endpoint">对端地址</string>
> + <string name="endpoint">对端</string>
> <string name="error_down">断开连接时出错:%s</string>
> <string name="error_fetching_apps">获取应用列表时出错:%s</string>
> <string name="error_root">请获取 root 权限并重试</string>
> <string name="error_up">建立连接时出错:%s</string>
> - <string name="exclude_private_ips">排除局域网 IP</string>
> + <string name="exclude_private_ips">排除局域网</string>
> <string name="excluded_applications">排除的应用</string>
> <string name="generate">生成密钥</string>
> <string name="generic_error">未知的 “%s” 错误</string>
> @@ -92,24 +92,32 @@
> <string name="logcat_error">无法运行 logcat:</string>
> <string name="module_version_error">无法确定内核模块版本</string>
> <string name="module_installer_not_found">没有可用于此设备的模块</string>
> - <string name="module_installer_initial">此实验性的内核模块可以提升性能</string>
> - <string name="module_installer_success">安装成功,应用将在 5 秒后重启</string>
> + <string name="module_installer_initial">使用内核模块可以提升性能(实验性)</string>
> + <string name="module_installer_success">安装成功,应用将于 5 秒后重启</string>
> <string name="module_installer_title">下载并安装内核模块</string>
> <string name="module_installer_working">正在下载安装...</string>
> <string name="module_installer_error">发生错误,请重试</string>
> + <string name="module_disabler_disabled_title">启用内核模块</string>
> + <string name="module_disabler_disabled_summary">内核空间的模块性能较强,但可能不稳定</string>
> + <string name="module_disabler_enabled_title">停用内核模块</string>
> + <string name="module_disabler_enabled_summary">用户空间的模块性能较弱,但稳定性更好</string>
> + <string name="module_disabler_working">应用将于 5 秒后重启</string>
> <string name="mtu">MTU</string>
> + <string name="multiple_tunnels_title">同时开启多条隧道</string>
> + <string name="multiple_tunnels_summary_on">当前允许同时开启多条隧道</string>
> + <string name="multiple_tunnels_summary_off">当前一次只能开启一条隧道</string>
> <string name="name">名称</string>
> <string name="no_config_error">尝试在无配置情况下建立连接</string>
> <string name="no_configs_error">未找到配置</string>
> <string name="no_tunnels_error">无隧道</string>
> <string name="parse_error_generic">字符串</string>
> - <string name="parse_error_inet_address"> IP 地址</string>
> - <string name="parse_error_inet_endpoint">对端地址</string>
> - <string name="parse_error_inet_network"> IP 网络</string>
> + <string name="parse_error_inet_address"> IP 地址</string>
> + <string name="parse_error_inet_endpoint">对端</string>
> + <string name="parse_error_inet_network"> IP 网络</string>
> <string name="parse_error_integer">数字</string>
> - <string name="parse_error_reason">无法解析%1$s “%2$s” </string>
> + <string name="parse_error_reason">无法解析%1$s “%2$s” </string>
> <string name="peer">节点 / Peer</string>
> - <string name="permission_description">允许一个应用对 WireGuard 隧道进行控制(开启 / 关闭隧道),但可能会误传一些流量</string>
> + <string name="permission_description">允许其他应用控制 WireGuard 隧道(开启 / 关闭),但可能会误传一些流量</string>
> <string name="permission_label">控制 WireGuard 隧道</string>
> <string name="persistent_keepalive">连接保活间隔</string>
> <string name="pre_shared_key">预共享密钥</string>
> @@ -117,7 +125,9 @@
> <string name="public_key">公钥</string>
> <string name="public_key_description">公钥</string>
> <string name="qr_code_hint">提示:使用命令 `qrencode -t ansiutf8 < tunnel.conf` 生成二维码</string>
> - <string name="restore_on_boot_title">开机自启</string>
> + <string name="restore_on_boot_summary_on">设备启动时自动开启上次使用的隧道</string>
> + <string name="restore_on_boot_summary_off">未启用</string>
> + <string name="restore_on_boot_title">启动时恢复</string>
> <string name="save">保存</string>
> <string name="select_all">全选</string>
> <string name="set_exclusions">确定</string>
> @@ -128,9 +138,9 @@
> <string name="toggle_error">切换隧道状态时出错:%s</string>
> <string name="tools_installer_already">wg 与 wg-quick 已安装</string>
> <string name="tools_installer_failure">无法安装命令行工具(尚未获取 root 权限?)</string>
> - <string name="tools_installer_initial">安装脚本工具(可选)</string>
> - <string name="tools_installer_initial_magisk">安装脚本工具为 Magisk 模块(可选)</string>
> - <string name="tools_installer_initial_system">安装脚本工具至系统分区(可选)</string>
> + <string name="tools_installer_initial">安装命令行工具(可选)</string>
> + <string name="tools_installer_initial_magisk">安装命令行工具为 Magisk 模块(可选)</string>
> + <string name="tools_installer_initial_system">安装命令行工具至系统分区(可选)</string>
> <string name="tools_installer_success_magisk">wg 与 wg-quick 已安装为 Magisk 模块(重启后生效)</string>
> <string name="tools_installer_success_system">wg 与 wg-quick 已安装至系统分区</string>
> <string name="tools_installer_title">安装命令行工具</string>
> --
> 2.24.1.windows.2
>
Applied, thanks!
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] Update Simplified Chinese translation
@ 2020-03-12 11:40 srb12345
2020-03-12 11:47 ` Harsh Shandilya
0 siblings, 1 reply; 15+ messages in thread
From: srb12345 @ 2020-03-12 11:40 UTC (permalink / raw)
To: wireguard; +Cc: LilligantMatsuri
From: LilligantMatsuri <srb12345@vip.qq.com>
Signed-off-by: LilligantMatsuri <srb12345@vip.qq.com>
---
ui/src/main/res/values-zh-rCN/strings.xml | 40 ++++++++++++++---------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/ui/src/main/res/values-zh-rCN/strings.xml b/ui/src/main/res/values-zh-rCN/strings.xml
index c8175f1..d3243f9 100644
--- a/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/ui/src/main/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
</plurals>
<string name="add_peer">添加节点</string>
<string name="addresses">局域网 IP 地址</string>
- <string name="allowed_ips">允许的 IP 地址(段)</string>
+ <string name="allowed_ips">路由的 IP 地址(段)</string>
<string name="app_name">WireGuard</string>
<string name="bad_config_context">%1$s 的 %2$s 字段</string>
<string name="bad_config_context_top_level">%s</string>
@@ -49,7 +49,7 @@
<string name="config_save_success">已保存 “%s” 的配置</string>
<string name="create_activity_title">创建 WireGuard 隧道</string>
<string name="create_bin_dir_error">无法创建本地二进制文件目录</string>
- <string name="create_empty">手动配置</string>
+ <string name="create_empty">手动创建</string>
<string name="create_from_file">导入配置或压缩包</string>
<string name="create_from_qr_code">扫描二维码</string>
<string name="create_output_dir_error">无法创建输出目录</string>
@@ -63,12 +63,12 @@
<string name="toggle_all">反选</string>
<string name="dns_servers">DNS 服务器</string>
<string name="edit">编辑</string>
- <string name="endpoint">对端地址</string>
+ <string name="endpoint">对端</string>
<string name="error_down">断开连接时出错:%s</string>
<string name="error_fetching_apps">获取应用列表时出错:%s</string>
<string name="error_root">请获取 root 权限并重试</string>
<string name="error_up">建立连接时出错:%s</string>
- <string name="exclude_private_ips">排除局域网 IP</string>
+ <string name="exclude_private_ips">排除局域网</string>
<string name="excluded_applications">排除的应用</string>
<string name="generate">生成密钥</string>
<string name="generic_error">未知的 “%s” 错误</string>
@@ -92,24 +92,32 @@
<string name="logcat_error">无法运行 logcat:</string>
<string name="module_version_error">无法确定内核模块版本</string>
<string name="module_installer_not_found">没有可用于此设备的模块</string>
- <string name="module_installer_initial">此实验性的内核模块可以提升性能</string>
- <string name="module_installer_success">安装成功,应用将在 5 秒后重启</string>
+ <string name="module_installer_initial">使用内核模块可以提升性能(实验性)</string>
+ <string name="module_installer_success">安装成功,应用将于 5 秒后重启</string>
<string name="module_installer_title">下载并安装内核模块</string>
<string name="module_installer_working">正在下载安装...</string>
<string name="module_installer_error">发生错误,请重试</string>
+ <string name="module_disabler_disabled_title">启用内核模块</string>
+ <string name="module_disabler_disabled_summary">内核空间的模块性能较强,但可能不稳定</string>
+ <string name="module_disabler_enabled_title">停用内核模块</string>
+ <string name="module_disabler_enabled_summary">用户空间的模块性能较弱,但稳定性更好</string>
+ <string name="module_disabler_working">应用将于 5 秒后重启</string>
<string name="mtu">MTU</string>
+ <string name="multiple_tunnels_title">同时开启多条隧道</string>
+ <string name="multiple_tunnels_summary_on">当前允许同时开启多条隧道</string>
+ <string name="multiple_tunnels_summary_off">当前一次只能开启一条隧道</string>
<string name="name">名称</string>
<string name="no_config_error">尝试在无配置情况下建立连接</string>
<string name="no_configs_error">未找到配置</string>
<string name="no_tunnels_error">无隧道</string>
<string name="parse_error_generic">字符串</string>
- <string name="parse_error_inet_address"> IP 地址</string>
- <string name="parse_error_inet_endpoint">对端地址</string>
- <string name="parse_error_inet_network"> IP 网络</string>
+ <string name="parse_error_inet_address"> IP 地址</string>
+ <string name="parse_error_inet_endpoint">对端</string>
+ <string name="parse_error_inet_network"> IP 网络</string>
<string name="parse_error_integer">数字</string>
- <string name="parse_error_reason">无法解析%1$s “%2$s” </string>
+ <string name="parse_error_reason">无法解析%1$s “%2$s” </string>
<string name="peer">节点 / Peer</string>
- <string name="permission_description">允许一个应用对 WireGuard 隧道进行控制(开启 / 关闭隧道),但可能会误传一些流量</string>
+ <string name="permission_description">允许其他应用控制 WireGuard 隧道(开启 / 关闭),但可能会误传一些流量</string>
<string name="permission_label">控制 WireGuard 隧道</string>
<string name="persistent_keepalive">连接保活间隔</string>
<string name="pre_shared_key">预共享密钥</string>
@@ -117,7 +125,9 @@
<string name="public_key">公钥</string>
<string name="public_key_description">公钥</string>
<string name="qr_code_hint">提示:使用命令 `qrencode -t ansiutf8 < tunnel.conf` 生成二维码</string>
- <string name="restore_on_boot_title">开机自启</string>
+ <string name="restore_on_boot_summary_on">设备启动时自动开启上次使用的隧道</string>
+ <string name="restore_on_boot_summary_off">未启用</string>
+ <string name="restore_on_boot_title">启动时恢复</string>
<string name="save">保存</string>
<string name="select_all">全选</string>
<string name="set_exclusions">确定</string>
@@ -128,9 +138,9 @@
<string name="toggle_error">切换隧道状态时出错:%s</string>
<string name="tools_installer_already">wg 与 wg-quick 已安装</string>
<string name="tools_installer_failure">无法安装命令行工具(尚未获取 root 权限?)</string>
- <string name="tools_installer_initial">安装脚本工具(可选)</string>
- <string name="tools_installer_initial_magisk">安装脚本工具为 Magisk 模块(可选)</string>
- <string name="tools_installer_initial_system">安装脚本工具至系统分区(可选)</string>
+ <string name="tools_installer_initial">安装命令行工具(可选)</string>
+ <string name="tools_installer_initial_magisk">安装命令行工具为 Magisk 模块(可选)</string>
+ <string name="tools_installer_initial_system">安装命令行工具至系统分区(可选)</string>
<string name="tools_installer_success_magisk">wg 与 wg-quick 已安装为 Magisk 模块(重启后生效)</string>
<string name="tools_installer_success_system">wg 与 wg-quick 已安装至系统分区</string>
<string name="tools_installer_title">安装命令行工具</string>
--
2.24.1.windows.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] Update Simplified Chinese translation
@ 2020-02-26 3:21 =?gb18030?B?TWF0c3VyaQ==?=
0 siblings, 0 replies; 15+ messages in thread
From: =?gb18030?B?TWF0c3VyaQ==?= @ 2020-02-26 3:21 UTC (permalink / raw)
To: =?gb18030?B?U2FtdWVsIEhvbGxhbmQ=?=, =?gb18030?B?d2lyZWd1YXJk?=
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: Type: text/plain; charset="gb18030", Size: 1719 bytes --]
Yesterday I remade a patch that contains all the changes so far.
Please review it. "values-zh-rCN" has not been merged yet, just
ignore those two patches I sent before (on 02/16 and 02/23). Thanks.
Regards,
Matsuri
------------------ ÔʼÓʼþ ------------------
·¢¼þÈË: "Samuel Holland"<samuel@sholland.org>;
·¢ËÍʱ¼ä: 2020Äê2ÔÂ25ÈÕ(ÐÇÆÚ¶þ) ÉÏÎç8:56
ÊÕ¼þÈË: "Matsuri"<srb12345@vip.qq.com>;"wireguard"<wireguard@lists.zx2c4.com>;
Ö÷Ìâ: Re: [PATCH] Update Simplified Chinese translation
On 2/23/20 5:12 AM, srb12345@vip.qq.com wrote:
> From: LilligantMatsuri <srb12345@vip.qq.com>
>
> Signed-off-by: LilligantMatsuri <srb12345@vip.qq.com>
> ---
> app/src/main/res/values-zh-rCN/strings.xml | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
> index 3360dae..97e871a 100644
> --- a/app/src/main/res/values-zh-rCN/strings.xml
> +++ b/app/src/main/res/values-zh-rCN/strings.xml
> @@ -1,21 +1,27 @@
> <?xml version="1.0" encoding="utf-8"?>
> <resources>
> <plurals name="delete_error">
> + <item quantity="one">ÎÞ·¨É¾³ý %d Ï%s</item>
> <item quantity="other">ÎÞ·¨É¾³ý %d Ï%s</item>
These look to be the same as the "other" case. Additional quantity items are
only needed if they are different:
https://developer.android.com/guide/topics/resources/string-resource#plurals-item-element
[-- Attachment #1.2: Type: text/html, Size: 2206 bytes --]
[-- Attachment #2: Type: text/plain, Size: 148 bytes --]
_______________________________________________
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-03-12 11:50 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-23 11:12 [PATCH] Update Simplified Chinese translation srb12345
2020-02-25 0:56 ` Samuel Holland
2020-02-25 8:13 ` Eiji Tanioka
2020-02-26 2:56 ` Samuel Holland
2020-02-26 3:10 ` Eiji Tanioka
2020-02-26 3:44 ` Vasili Pupkin
2020-02-26 3:59 ` Samuel Holland
2020-02-29 7:00 ` Vasili Pupkin
2020-02-29 8:35 ` Eiji Tanioka
2020-02-29 8:54 ` Jason A. Donenfeld
[not found] ` <5428f486-49cd-0321-de5b-9ef6ca3e8dad@gmail.com>
2020-03-01 6:53 ` Eiji Tanioka
2020-03-01 7:00 ` Jason A. Donenfeld
2020-02-26 3:21 =?gb18030?B?TWF0c3VyaQ==?=
2020-03-12 11:40 srb12345
2020-03-12 11:47 ` Harsh Shandilya
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).