Re: [PATCH] Add japanese translation.

2020-02-24 Thread Eiji Tanioka
Hi,

Thank you for the instruction.
Yes, Japanese doesn't have plural. I will use this file.

When finished, I will send "resources.rc" and "messages.gotext.json" to you.
Which style do you prefer? "git format-patch" or "attachment"?

Regards,
Eiji

2020年2月23日(日) 19:19 Simon Rozman :
>
> Hi!
>
> 1. For starters, I'll need the translation of "WireGuard: Fast, Modern, 
> Secure VPN Tunnel" string. This string is written into .exe resources and is 
> located separately (in resources.rc).
>
> 2. Translate this file: 
> https://git.zx2c4.com/wireguard-windows/tree/locales/ja/messages.gotext.json?h=sr/l18n.
>  Fill the "translation" string properties with Japanese text. Japanese 
> doesn't have plural, right? If you need to word some translation differently 
> (based on a cardinal variable), you may extend "translation" string property 
> into to a "select" object. See 
> https://git.zx2c4.com/wireguard-windows/tree/locales/en/messages.gotext.json?h=sr/l18n
>  or 
> https://git.zx2c4.com/wireguard-windows/tree/locales/fr/messages.gotext.json?h=sr/l18n
>  for plural examples (search for "plural"). (Yes, we are using 
> English-to-English translation to translate "{Seconds} second(s)" into nicer 
> to read "1 second", "2 seconds"...)
>
> 3. Deliver translation to me and I shall handle a commit in your name. Before 
> publishing, I will make some screenshots in Japanese, for you to confirm.
>
> Best regards,
> Simon
>
> > -Original Message-
> > From: Eiji Tanioka 
> > Sent: Sunday, February 23, 2020 9:35 AM
> > To: Simon Rozman ; wireguard@lists.zx2c4.com
> > Subject: Re: [PATCH] Add japanese translation.
> >
> > Thank you for quick reply!
> >
> > I read README.md.
> > But I don't have Windows environment I can use freely, so could you
> > generate Japanese messages.json file?
> >
> > Thanks,
> >
> > 2020年2月23日(日) 17:23 Simon Rozman :
> > >
> > > Hi!
> > >
> > > Please, see the simple translation instructions in the sr/l18n branch
> > README.md file.
> > >
> > > If you don't have Windows at your disposal, I can generate an empty
> > Japanese messages.json file for you.
> > >
> > > Best regards,
> > > Simon
> > > 
> > > From: Eiji Tanioka 
> > > Sent: Sunday, 23 February 2020 08:49
> > > To: Simon Rozman; wireguard@lists.zx2c4.com
> > > Subject: Re: [PATCH] Add japanese translation.
> > >
> > > Hi Simon!
> > >
> > > I finished wireguard-apple translation to Japanese.
> > > So I will start to translate wireguard-windows.
> > >
> > > How do I work on it?
> > > I guess:
> > > - checkout sr/i18n
> > > - create locales/ja/messages.gotext.json
> > > - translate "message" into "translation" field
> > > - send patch to ML
> > >
> > > Is this correct?
> > > Thanks,
> > >
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [PATCH] Add japanese translation.

2020-02-24 Thread Jason A. Donenfeld
On Mon, Feb 24, 2020 at 9:57 PM Eiji Tanioka  wrote:
>
> Hi,
>
> Thank you for the instruction.
> Yes, Japanese doesn't have plural. I will use this file.
>
> When finished, I will send "resources.rc" and "messages.gotext.json" to you.
> Which style do you prefer? "git format-patch" or "attachment"?

Please avoid sending attachments to the mailing list, and rather use
`git format-patch` and `git send-email`.

Thanks a bunch for doing this. It's very appreciated work.
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [PATCH] Add japanese translation.

2020-02-24 Thread Eiji Tanioka
OK,
I will use `git format-patch` and `git send-email`.

2020年2月24日(月) 22:59 Jason A. Donenfeld :
>
> On Mon, Feb 24, 2020 at 9:57 PM Eiji Tanioka  wrote:
> >
> > Hi,
> >
> > Thank you for the instruction.
> > Yes, Japanese doesn't have plural. I will use this file.
> >
> > When finished, I will send "resources.rc" and "messages.gotext.json" to you.
> > Which style do you prefer? "git format-patch" or "attachment"?
>
> Please avoid sending attachments to the mailing list, and rather use
> `git format-patch` and `git send-email`.
>
> Thanks a bunch for doing this. It's very appreciated work.
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: xtables lock at startup?

2020-02-24 Thread Dimitri J. Panagiotou
OK, thanks.



On Sun, Feb 23, 2020 at 2:58 AM Jason A. Donenfeld  wrote:

> Do what it says; pass the -w option to iptables.
>
> On Sun, Feb 23, 2020, 11:36 Dimitri J. Panagiotou 
> wrote:
>
>> Hi,
>>
>> Since upgrading to Fedora 31 (5.5), wireguard (latest) does not start
>> after rebooting.
>> It does start with no problem at all after rebooting, by manually running
>> wg-quick.
>>
>> This is what I get:
>> -- Reboot --
>> Feb 22 01:19:48 myservername systemd[1]: Starting WireGuard via
>> wg-quick(8) for wg0...
>> Feb 22 01:19:49 myservername wg-quick[1173]: [#] ip link add wg0 type
>> wireguard
>> Feb 22 01:19:49 myservername wg-quick[1173]: [#] wg setconf wg0 /dev/fd/63
>> Feb 22 01:19:50 myservername wg-quick[1173]: [#] ip -4 address add
>> 10.12.182.1/24 dev wg0
>> Feb 22 01:19:50 myservername wg-quick[1173]: [#] ip link set mtu 1420 up
>> dev wg0
>> Feb 22 01:19:50 myservername wg-quick[1173]: [#] mount `10.12.197.1'
>> /etc/resolv.conf
>> Feb 22 01:19:51 myservername wg-quick[1173]: [#] iptables -A FORWARD -i
>> wg0 -j ACCEPT; iptables -t nat -A POSTROUTING -o enp2s0 -j MASQUERADE
>> Feb 22 01:19:51 myservername wg-quick[1173]: Another app is currently
>> holding the xtables lock. Perhaps you want to use the -w option?
>> Feb 22 01:19:51 myservername wg-quick[1173]: [#] umount /etc/resolv.conf
>> Feb 22 01:19:51 myservername wg-quick[1173]: [#] ip link delete dev wg0
>> Feb 22 01:19:51 myservername systemd[1]: wg-quick@wg0.service: Main
>> process exited, code=exited, status=4/NOPERMISSION
>> Feb 22 01:19:51 myservername systemd[1]: wg-quick@wg0.service: Failed
>> with result 'exit-code'.
>> Feb 22 01:19:51 myservername systemd[1]: Failed to start WireGuard via
>> wg-quick(8) for wg0.
>>
>> Running
>> wireguard-dkms.noarch 1:0.0.20200215-2.fc31
>>@jdoss-wireguard
>> wireguard-tools.x86_641:1.0.20200102-1.fc31
>>@jdoss-wireguard
>>
>> Any idea what's causing this?
>>
>> Thanks,
>> -dimitri
>>
>>
>> ___
>> 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


[PATCH] global: use RTMGRP_* consts from x/sys/unix

2020-02-24 Thread Tobias Klauser
Update the golang.org/x/sys/unix dependency and use the newly introduced
RTMGRP_* consts instead of using the corresponding RTNLGRP_* const to
create a mask.

Signed-off-by: Tobias Klauser 
---
 device/conn_linux.go | 2 +-
 go.mod   | 2 +-
 go.sum   | 4 ++--
 tun/tun_linux.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device/conn_linux.go b/device/conn_linux.go
index 94b6d5c072c7..e90b0e35b456 100644
--- a/device/conn_linux.go
+++ b/device/conn_linux.go
@@ -118,7 +118,7 @@ func createNetlinkRouteSocket() (int, error) {
}
saddr := &unix.SockaddrNetlink{
Family: unix.AF_NETLINK,
-   Groups: uint32(1 << (unix.RTNLGRP_IPV4_ROUTE - 1)),
+   Groups: unix.RTMGRP_IPV4_ROUTE,
}
err = unix.Bind(sock, saddr)
if err != nil {
diff --git a/go.mod b/go.mod
index 34b1e720a8ea..c5f11d5966ec 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,6 @@ go 1.12
 require (
golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc
golang.org/x/net v0.0.0-20191003171128-d98b1b443823
-   golang.org/x/sys v0.0.0-20191003212358-c178f38b412c
+   golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae
golang.org/x/text v0.3.2
 )
diff --git a/go.sum b/go.sum
index 970f4cbade71..555fb0eec4fd 100644
--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,8 @@ golang.org/x/net v0.0.0-20191003171128-d98b1b443823 
h1:Ypyv6BNJh07T1pUSrehkLemqP
 golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod 
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod 
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191003212358-c178f38b412c 
h1:6Zx7DRlKXf79yfxuQ/7GqV3w2y7aDsk6bGg0MzF5RVU=
-golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae 
h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/tun/tun_linux.go b/tun/tun_linux.go
index 36b43ea4d094..7ab062314662 100644
--- a/tun/tun_linux.go
+++ b/tun/tun_linux.go
@@ -85,7 +85,7 @@ func createNetlinkSocket() (int, error) {
}
saddr := &unix.SockaddrNetlink{
Family: unix.AF_NETLINK,
-   Groups: uint32((1 << (unix.RTNLGRP_LINK - 1)) | (1 << 
(unix.RTNLGRP_IPV4_IFADDR - 1)) | (1 << (unix.RTNLGRP_IPV6_IFADDR - 1))),
+   Groups: unix.RTMGRP_LINK | unix.RTMGRP_IPV4_IFADDR | 
unix.RTMGRP_IPV6_IFADDR,
}
err = unix.Bind(sock, saddr)
if err != nil {
-- 
2.25.0

___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


[PATCH] Update Simplified Chinese translation

2020-02-24 Thread srb12345
From: LilligantMatsuri 

Signed-off-by: LilligantMatsuri 
---
 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 @@
 
 
 
+无法删除 %d 项:%s
 无法删除 %d 项:%s
 
 
+删除了 %d 项
 删除了 %d 项
 
 
+已选择 %d 项
 已选择 %d 项
 
 
+导入了 %d 项,读取到 %d 项
 导入了 %d 项,读取到 %d 项
 
 
+导入了 %d 项
 导入了 %d 项
 
 
+%d 个排除应用
 %d 个排除应用
 
 添加节点
@@ -38,7 +44,7 @@
 属性未知
 节未知
 数值超出范围
-文件扩展名必须为 .conf 或 .zip
+扩展名必须为 .conf 或 .zip
 取消
 无法删除配置 “%s”
 “%s” 的配置已存在
@@ -60,7 +66,7 @@
 正在使用暗色(黑夜)主题
 使用暗色主题
 删除
-全部取消
+反选
 DNS 服务器
 编辑
 对端地址
-- 
2.24.1.windows.2

___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


[feature request] Randomize PersistentKeepalive

2020-02-24 Thread John Smith
There are some applications where you do not want a listener to know that a
channel is being kept alive and no information is being transmitted.

Perhaps the ideal solution would be to add an option to the wg tool to send
a keepalive packet, preferably of arbitrary size within some range. A
script could then be used to keep the channel alive in a manner. Would be
cleaner than sending something else through that may require further action
by the peer.
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [PATCH] wg show: Add json output

2020-02-24 Thread Barry Scott



> On 23 Feb 2020, at 12:45, Arti Zirk  wrote:
> 
> On E, 2020-02-17 at 15:47 +1100, Matthew Oliver wrote:
>> Someone asked about this in the IRC channel, so quickly wrote up a
>> patch to add it. No pressure if you do/don't want to merge it :)
> 
> If you have wireguard-tools package installed then it should be
> possible to use the incldued wg-json script to do the same
> 
>  sudo /usr/share/wireguard-tools/examples/json/wg-json

When I built my tools in python on top of the wg command I was
please to see a machine interface, but find the \t separated list
of values odd to find in a modern app.

I think it would be a good addition to have the JSON output
without the need to use a contrib script. Many text commands
output in JSON or XML for ease of interfacing.

The JSON would also provide a nice way to add more attributes
in the future.

Barry

___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


[PATCH] DO_NOT_LAUNCH parameter was ignored by MSI, should work now

2020-02-24 Thread Arjen Brouwer
From: Arjen Brouwer 


The `DO_NO_LAUNCH` parameter did not actually work. After running the installer 
with the DO_NO_LAUNCH parameter, the UI still showed up afterwards and the MSI 
log had the following entry:

```
MSI (c) (28:08) [14:43:17:966]: Ignoring disallowed property DO_NOT_LAUNCH
```

By explicitly defining the DO_NOT_LAUNCH property and making it secure, solved 
the problem.

---
 installer/wireguard.wxs | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index 5bbb1eb..781d20c 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -45,7 +45,8 @@



-
+   
+   

@@ -135,7 +136,7 @@
-->


-   (&WireGuardFeature = 3) AND NOT 
DO_NOT_LAUNCH
+   

 



-   (&WireGuardFeature = -1) AND (!WireGuardFeature = 
3) AND NOT DO_NOT_LAUNCH
+   


 
-- 
2.24.1.windows.2

___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [PATCH] Update Simplified Chinese translation

2020-02-24 Thread Samuel Holland
On 2/23/20 5:12 AM, srb12...@vip.qq.com wrote:
> From: LilligantMatsuri 
> 
> Signed-off-by: LilligantMatsuri 
> ---
>  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 @@
>  
>  
>  
> +无法删除 %d 项:%s
>  无法删除 %d 项:%s

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

>  
>  
> +删除了 %d 项
>  删除了 %d 项
>  
>  
> +已选择 %d 项
>  已选择 %d 项
>  
>  
> +导入了 %d 项,读取到 %d 项
>  导入了 %d 项,读取到 %d 项
>  
>  
> +导入了 %d 项
>  导入了 %d 项
>  
>  
> +%d 个排除应用
>  %d 个排除应用
>  
>  添加节点
> @@ -38,7 +44,7 @@
>  属性未知
>  节未知
>  数值超出范围
> -文件扩展名必须为 .conf 或 .zip
> +扩展名必须为 .conf 或 .zip
>  取消
>  无法删除配置 “%s”
>  “%s” 的配置已存在
> @@ -60,7 +66,7 @@
>  正在使用暗色(黑夜)主题
>  使用暗色主题
>  删除
> -全部取消
> +反选
>  DNS 服务器
>  编辑
>  对端地址
> 

___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: Bug report: WireGuard iOS prioritizes IPv4 over IPv6

2020-02-24 Thread Maurice Walker
Hi Matthias,

Thanks for the explanation.

I did some more testing on Windows. If the peer FQDN resolves to both  and
A, WireGuard seems to check for an interface with an IPv4 address (other than
link-local or loopback). If there is one, it uses IPv4, otherwise IPv6. The
issue is that it doesn't seem to check whether there actually is an IPv4 route
to the peer. So as long as there is any IPv4 address on any interface, WG
doesn't use IPv6 - even if there is no IPv4 default gateway (or other IPv4
route to the peer).
Since it already seems to perform some rudimentary IPv4 connectivity check,
a simple check of the routing table could be a stopgap fix.

> Thus the frontend needs to remember all addresses, send one to the
> driver, wait a bit, check whether a link could be established, then try
> with another peer address. Repeat until success.

Right, that would ultimately be what one would wish for. But until this is
implemented, WG should at least prefer IPv6 over IPv4.

Cheers,

Maurice

(Sorry for double posting. I mailed again after the first mail had been on
hold for moderator approval for three days. I will be more patient this time.)
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [feature request] Randomize PersistentKeepalive

2020-02-24 Thread Reid Rankin
Won't help -- a keepalive is by definition the minimum possible size frame.
That means not just that it's a predictable size, but that everything that
size must be a keepalive, randomized interval or not.

To get the kind of effect you're looking for, you'd need to send actual
dummy data -- which, incidentally, you can totally do no problem just by
making sure you're sending packets from an IP that isn't on the AllowedIPs
list on the other side. That will always cause the payload to be silently
dropped on the floor before it even hits the rest of the networking stack,
and with resource usage comparable to that of keepalives.

--Reid

On Mon, Feb 24, 2020 at 7:49 PM John Smith  wrote:

> There are some applications where you do not want a listener to know that
> a channel is being kept alive and no information is being transmitted.
>
> Perhaps the ideal solution would be to add an option to the wg tool to
> send a keepalive packet, preferably of arbitrary size within some range. A
> script could then be used to keep the channel alive in a manner. Would be
> cleaner than sending something else through that may require further action
> by the peer.
> ___
> 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


Re: FreeBSD wireguard wg-quick remote IP address assignment is incorrect

2020-02-24 Thread Peter Libassi


> 23 feb. 2020 kl. 16:32 skrev Jason A. Donenfeld :
> 
> On Sun, Feb 23, 2020 at 2:25 PM Peter Libassi  wrote:
>> 
>> Ok, Well even if using another local IP in range 127.0.0.0/8 we can’t be 
>> certain we will clash with something else.
>> 
>> How about adding a directive for the remote interface address in wg.conf? 
>> Like this:
>> 
>> # cat /usr/local/etc/wireguard/wg0.conf
>> [Interface]
>> PrivateKey = <->
>> ListenPort = 
>> Address = 192.168.2.1/32
>> RemoteAddress = 192.168.2.2
>> 
>> [Peer]
>> PublicKey = <->
>> AllowedIPs = 192.168.2.0/24
>> Endpoint = 172.16.0.23:
>> 
>> # diff /usr/local/bin/wg-quick.org ./wg-quick
>> 17a18
>>> REMOTE_ADDRESS=""
>> 86a88
>>> RemoteAddress) REMOTEADDRESS="$value"; continue ;;
>> 175c177,181
>> < cmd ifconfig "$INTERFACE" inet "$1" "${1%%/*}" alias
>> ---
>>>if [[ -n $REMOTEADDRESS ]]; then
>>> cmd ifconfig "$INTERFACE" inet "$1" "$REMOTEADDRESS" alias
>>>else
>>>cmd ifconfig "$INTERFACE" inet "$1" "${1%%/*}" alias
>>>fi
> 
> This is not a correct fix; we're not going to add a configuration nob
> to work around FreeBSD network stack gotchas.
> 
> Rather, I'd prefer to see all the FreeBSD wg-quick semantics redone
> around multiple routing tables and marks, much like on Linux, though I
> don't know if that's possible. Barring that, a proper solution
> probably involves re-reading the ifconfig man page a few dozen times
> to find out how to have interface addresses as we need them.

It works perfectly for my single site-2-site use case. You have two options as 
I see it. Either convince the FreeBSD team to drop the dest_address requirement 
or implement local/remote address awareness per [Peer] in the wg-quick script.

/Peter

___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [PATCH] Add japanese translation.

2020-02-24 Thread Eiji Tanioka
Hi Simon,

I read "resources.rc", and start working.
and I have question about it.

- For Japanese resource, copy from line 45-50 and paste it at EOF
- Rewrite "LANG_ENGLISH" to "LANG_JAPANESE"
- Rewrite "040904b0" to "041104b0"
- Rewrite "0x409" to "0x411"
- Translate "WireGuard: Fast, Modern, Secure VPN Tunnel" into Japanese

I googled and found that "0x411" means "Japanese".
https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource

Is this correct?

Regards,

2020年2月23日(日) 19:19 Simon Rozman :
>
> Hi!
>
> 1. For starters, I'll need the translation of "WireGuard: Fast, Modern, 
> Secure VPN Tunnel" string. This string is written into .exe resources and is 
> located separately (in resources.rc).
>
> 2. Translate this file: 
> https://git.zx2c4.com/wireguard-windows/tree/locales/ja/messages.gotext.json?h=sr/l18n.
>  Fill the "translation" string properties with Japanese text. Japanese 
> doesn't have plural, right? If you need to word some translation differently 
> (based on a cardinal variable), you may extend "translation" string property 
> into to a "select" object. See 
> https://git.zx2c4.com/wireguard-windows/tree/locales/en/messages.gotext.json?h=sr/l18n
>  or 
> https://git.zx2c4.com/wireguard-windows/tree/locales/fr/messages.gotext.json?h=sr/l18n
>  for plural examples (search for "plural"). (Yes, we are using 
> English-to-English translation to translate "{Seconds} second(s)" into nicer 
> to read "1 second", "2 seconds"...)
>
> 3. Deliver translation to me and I shall handle a commit in your name. Before 
> publishing, I will make some screenshots in Japanese, for you to confirm.
>
> Best regards,
> Simon
>
> > -Original Message-
> > From: Eiji Tanioka 
> > Sent: Sunday, February 23, 2020 9:35 AM
> > To: Simon Rozman ; wireguard@lists.zx2c4.com
> > Subject: Re: [PATCH] Add japanese translation.
> >
> > Thank you for quick reply!
> >
> > I read README.md.
> > But I don't have Windows environment I can use freely, so could you
> > generate Japanese messages.json file?
> >
> > Thanks,
> >
> > 2020年2月23日(日) 17:23 Simon Rozman :
> > >
> > > Hi!
> > >
> > > Please, see the simple translation instructions in the sr/l18n branch
> > README.md file.
> > >
> > > If you don't have Windows at your disposal, I can generate an empty
> > Japanese messages.json file for you.
> > >
> > > Best regards,
> > > Simon
> > > 
> > > From: Eiji Tanioka 
> > > Sent: Sunday, 23 February 2020 08:49
> > > To: Simon Rozman; wireguard@lists.zx2c4.com
> > > Subject: Re: [PATCH] Add japanese translation.
> > >
> > > Hi Simon!
> > >
> > > I finished wireguard-apple translation to Japanese.
> > > So I will start to translate wireguard-windows.
> > >
> > > How do I work on it?
> > > I guess:
> > > - checkout sr/i18n
> > > - create locales/ja/messages.gotext.json
> > > - translate "message" into "translation" field
> > > - send patch to ML
> > >
> > > Is this correct?
> > > Thanks,
> > >
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard


Re: [PATCH] Add japanese translation.

2020-02-24 Thread Simon Rozman
Hi Eiji,

Yes, Microsoft-assigned locale ID for Japanese is 0x0411.

(0x04b0 stands for UTF-16. Legacy software would probably specify 0x03a4 = 
Japan (Shift – JIS X-0208) here. I'm not sure if this property is actually used 
anywhere other than Windows 95.)

Just put something like this to the resources.rc file after French (to keep the 
list sorted by language names in English):

LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
VERSIONINFO_TEMPLATE(
  "041104b0", 0x411, 0x4b0,
  "WireGuard: 高速で最新の安全なVPNトンネル",
  "https://www.wireguard.com/";
)

Best regards,
Simon

-Original Message-
From: Eiji Tanioka 
Date: Tuesday, 25 February 2020 at 08:07
To: Simon Rozman 
Cc: "wireguard@lists.zx2c4.com" 
Subject: Re: [PATCH] Add japanese translation.

Hi Simon,

I read "resources.rc", and start working.
and I have question about it.

- For Japanese resource, copy from line 45-50 and paste it at EOF
- Rewrite "LANG_ENGLISH" to "LANG_JAPANESE"
- Rewrite "040904b0" to "041104b0"
- Rewrite "0x409" to "0x411"
- Translate "WireGuard: Fast, Modern, Secure VPN Tunnel" into Japanese

I googled and found that "0x411" means "Japanese".
https://docs.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource

Is this correct?

Regards,



smime.p7s
Description: S/MIME cryptographic signature
___
WireGuard mailing list
WireGuard@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/wireguard