Translation update

upnp: Use a separate error for the error unmarshalling

AUTHORS

@@ -73,4 +73,5 @@ Tyler Brazier <tyler@tylerbrazier.com>
 Veeti Paananen <veeti.paananen@rojekti.fi>
 Vil Brekin <vilbrekin@gmail.com>
 Victor Buinsky <vix_booja@tut.by>
+William A. Kennington III <william@wkennington.com>
 Yannic A. <eipiminusone+github@gmail.com> <eipiminus1@users.noreply.github.com>

NICKS

@@ -72,5 +72,6 @@ tojrobinson	<tully@tojr.org>
 tylerbrazier	<tyler@tylerbrazier.com>
 uok		<ueomkail@gmail.com> <uok@users.noreply.github.com>
 veeti		<veeti.paananen@rojekti.fi>
+wkennington	<william@wkennington.com>
 wsgcsysadmin	<e.meitner@willystreet.coo>
 zukoo		<fxgsell@gmail.com>

build.go

@@ -219,7 +219,7 @@ func build(pkg string, tags []string) {
 	}
 
 	rmr(binary)
-	args := []string{"build", "-ldflags", ldflags()}
+	args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
 	if len(tags) > 0 {
 		args = append(args, "-tags", strings.Join(tags, ","))
 	}
@@ -448,7 +448,6 @@ func ldflags() string {
 	fmt.Fprintf(b, " -X main.BuildStamp%c%d", sep, buildStamp())
 	fmt.Fprintf(b, " -X main.BuildUser%c%s", sep, buildUser())
 	fmt.Fprintf(b, " -X main.BuildHost%c%s", sep, buildHost())
-	fmt.Fprintf(b, " -X main.BuildEnv%c%s", sep, buildEnvironment())
 	return b.String()
 }
 

build.sh

@@ -74,27 +74,26 @@ case "${1:-default}" in
 		;;
 
 	all)
-		build -goos darwin -goarch amd64 tar
+		platforms=(
+			darwin-amd64 dragonfly-amd64 freebsd-amd64 linux-amd64 netbsd-amd64 openbsd-amd64 solaris-amd64 windows-amd64
+			freebsd-386 linux-386 netbsd-386 openbsd-386 windows-386
+			linux-arm
+		)
 
-		build -goos dragonfly -goarch amd64 tar
+		for plat in "${platforms[@]}"; do
+			echo Building "$plat"
 
-		build -goos freebsd -goarch 386 tar
-		build -goos freebsd -goarch amd64 tar
+			goos="${plat%-*}"
+			goarch="${plat#*-}"
+			dist="tar"
 
-		build -goos linux -goarch 386 tar
-		build -goos linux -goarch amd64 tar
-		build -goos linux -goarch arm tar
+			if [[ $goos == "windows" ]]; then
+				dist="zip"
+			fi
 
-		build -goos netbsd -goarch 386 tar
-		build -goos netbsd -goarch amd64 tar
-
-		build -goos openbsd -goarch 386 tar
-		build -goos openbsd -goarch amd64 tar
-
-		build -goos solaris -goarch amd64 tar
-
-		build -goos windows -goarch 386 zip
-		build -goos windows -goarch amd64 zip
+			build -goos "$goos" -goarch "$goarch" "$dist"
+			echo
+		done
 		;;
 
 	test-cov)

cmd/syncthing/gui.go

@@ -398,14 +398,14 @@ func (s *apiSvc) postSystemDebug(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	q := r.URL.Query()
 	for _, f := range strings.Split(q.Get("enable"), ",") {
-		if f == "" {
+		if f == "" || l.ShouldDebug(f) {
 			continue
 		}
 		l.SetDebug(f, true)
 		l.Infof("Enabled debug data for %q", f)
 	}
 	for _, f := range strings.Split(q.Get("disable"), ",") {
-		if f == "" {
+		if f == "" || !l.ShouldDebug(f) {
 			continue
 		}
 		l.SetDebug(f, false)

cmd/syncthing/main.go

@@ -49,7 +49,6 @@ import (
 var (
 	Version     = "unknown-dev"
 	Codename    = "Beryllium Bedbug"
-	BuildEnv    = "default"
 	BuildStamp  = "0"
 	BuildDate   time.Time
 	BuildHost   = "unknown"
@@ -108,7 +107,7 @@ func init() {
 	BuildDate = time.Unix(int64(stamp), 0)
 
 	date := BuildDate.UTC().Format("2006-01-02 15:04:05 MST")
-	LongVersion = fmt.Sprintf(`syncthing %s "%s" (%s %s-%s %s) %s@%s %s`, Version, Codename, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildEnv, BuildUser, BuildHost, date)
+	LongVersion = fmt.Sprintf(`syncthing %s "%s" (%s %s-%s) %s@%s %s`, Version, Codename, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildUser, BuildHost, date)
 
 	if os.Getenv("STTRACE") != "" {
 		logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile

cmd/syncthing/usage_report.go

@@ -13,7 +13,6 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"net"
 	"net/http"
 	"runtime"
 	"sort"
@@ -184,8 +183,6 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 	for _, addr := range cfg.Options().GlobalAnnServers {
 		if addr == "default" || addr == "default-v4" || addr == "default-v6" {
 			defaultAnnounceServersDNS++
-		} else if stringIn(addr, config.DefaultDiscoveryServersIP) {
-			defaultAnnounceServersIP++
 		} else {
 			otherAnnounceServers++
 		}
@@ -221,15 +218,6 @@ func reportData(cfg *config.Wrapper, m *model.Model) map[string]interface{} {
 	return res
 }
 
-func stringIn(needle string, haystack []string) bool {
-	for _, s := range haystack {
-		if needle == s {
-			return true
-		}
-	}
-	return false
-}
-
 type usageReportingService struct {
 	cfg   *config.Wrapper
 	model *model.Model
@@ -249,19 +237,14 @@ func (s *usageReportingService) sendUsageReport() error {
 	var b bytes.Buffer
 	json.NewEncoder(&b).Encode(d)
 
-	transp := &http.Transport{}
-	client := &http.Client{Transport: transp}
-	if BuildEnv == "android" {
-		// This works around the lack of DNS resolution on Android... :(
-		transp.Dial = func(network, addr string) (net.Conn, error) {
-			return dialer.Dial(network, "194.126.249.13:443")
-		}
-	}
-
-	if s.cfg.Options().URPostInsecurely {
-		transp.TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
-		}
+	client := &http.Client{
+		Transport: &http.Transport{
+			Dial:  dialer.Dial,
+			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: s.cfg.Options().URPostInsecurely,
+			},
+		},
 	}
 	_, err := client.Post(s.cfg.Options().URURL, "application/json", &b)
 	return err

cmd/syncthing/verbose.go

@@ -32,8 +32,14 @@ func (s *verboseSvc) Serve() {
 	sub := events.Default.Subscribe(events.AllEvents)
 	defer events.Default.Unsubscribe(sub)
 
-	// We're ready to start processing events.
-	close(s.started)
+	select {
+	case <-s.started:
+		// The started channel has already been closed; do nothing.
+	default:
+		// This is the first time around. Indicate that we're ready to start
+		// processing events.
+		close(s.started)
+	}
 
 	for {
 		select {
@@ -96,7 +102,7 @@ func (s *verboseSvc) formatEvent(ev events.Event) string {
 		return fmt.Sprintf("Rejected unshared folder %q from device %v", data["folder"], data["device"])
 
 	case events.ItemStarted:
-		data := ev.Data.(map[string]interface{})
+		data := ev.Data.(map[string]string)
 		return fmt.Sprintf("Started syncing %q / %q (%v %v)", data["folder"], data["item"], data["action"], data["type"])
 	case events.ItemFinished:
 		data := ev.Data.(map[string]interface{})

gui/assets/lang/lang-ru.json

@@ -138,7 +138,7 @@
     "Resume": "Возобновить",
     "Reused": "Повторно использовано",
     "Save": "Сохранить",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "Оставшееся время сканирования",
     "Scanning": "Сканирование",
     "Select the devices to share this folder with.": "Выберите устройства, для которых будет доступна эта папка.",
     "Select the folders to share with this device.": "Выберите папку для предоставления доступа данному устройству",

gui/assets/lang/lang-zh-CN.json

@@ -1,5 +1,5 @@
 {
-    "A negative number of days doesn't make sense.": "天数不能为负。",
+    "A negative number of days doesn't make sense.": "天数不能为负",
     "A new major version may not be compatible with previous versions.": "重大更新可能与之前的版本之间无法兼容",
     "API Key": "API Key",
     "About": "关于",
@@ -20,7 +20,7 @@
     "Any devices configured on an introducer device will be added to this device as well.": "在介绍人设备上被添加的其它设备，也将会被添加到本机。",
     "Automatic upgrades": "自动升级",
     "Be careful!": "小心！",
-    "Bugs": "Bug汇报",
+    "Bugs": "问题回报",
     "CPU Utilization": "CPU使用率",
     "Changelog": "更新日志",
     "Clean out after": "在该时间后清除：",
@@ -68,12 +68,12 @@
     "Folder Path": "文件夹路径",
     "Folders": "文件夹",
     "GUI": "图形界面",
-    "GUI Authentication Password": "登陆web管理页面的密码",
-    "GUI Authentication User": "登陆web管理页面的用户名",
-    "GUI Listen Addresses": "web管理页面监听地址",
+    "GUI Authentication Password": "图形管理界面密码",
+    "GUI Authentication User": "图形管理界面用户名",
+    "GUI Listen Addresses": "图形管理界面监听地址",
     "Generate": "生成",
     "Global Discovery": "在互联网上寻找设备\n",
-    "Global Discovery Server": "用以在互联网上寻找设备的Announce服务器地址",
+    "Global Discovery Server": "全球发现服务器",
     "Global State": "全局状态",
     "Help": "帮助",
     "Home page": "主页",
@@ -138,7 +138,7 @@
     "Resume": "恢复",
     "Reused": "复用",
     "Save": "保存",
-    "Scan Time Remaining": "Scan Time Remaining",
+    "Scan Time Remaining": "扫描剩余时间",
     "Scanning": "扫描中",
     "Select the devices to share this folder with.": "选择将本文件夹共享给哪些设备",
     "Select the folders to share with this device.": "选择与该设备共享的文件夹。",
@@ -172,7 +172,7 @@
     "Syncthing is upgrading.": "Syncthing 正在升级",
     "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing 似乎关闭了，或者您的网络连接存在故障。重试中...",
     "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing 在处理您的请求时似乎遇到了问题。如果问题持续，请刷新页面，或重启 Syncthing。",
-    "The Syncthing admin interface is configured to allow remote access without a password.": "The Syncthing admin interface is configured to allow remote access without a password.",
+    "The Syncthing admin interface is configured to allow remote access without a password.": "当前配置允许在不使用密码的情况下远程访问 Syncthing 管理界面",
     "The aggregated statistics are publicly available at {%url%}.": "全局统计公布于 {{url}}",
     "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "设置已经保存，但是还未生效。Syncthing 需要重启以启用新的设置。",
     "The device ID cannot be blank.": "设备标识不能为空",
@@ -184,7 +184,7 @@
     "The folder ID must be a short identifier (64 characters or less) consisting of letters, numbers and the dot (.), dash (-) and underscode (_) characters only.": "文件夹标识不得长于 64 字符，且仅能包含字母、数字、半角句号（.）、横线（-）和下划线（_）。",
     "The folder ID must be unique.": "文件夹标识不得重复",
     "The folder path cannot be blank.": "文件夹路径不能为空",
-    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "保留的历史版本会满足以下条件：最近一小时内的历史版本，更新间隔小于30秒的仅保留一份。最近一天内的历史版本，更新间隔小于1小时的仅保留一份。最近一个月内的历史版本，更新间隔小于1天的仅保留一份。距离现在超过一个月且小于最长保留时间的，更新间隔小于1周的仅保留一份。",
+    "The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.": "保留的历史版本会遵循以下条件：最近一小时内的历史版本，更新间隔小于三十秒的仅保留一份。最近一天内的历史版本，更新间隔小于一小时的仅保留一份。最近一个月内的历史版本，更新间隔小于一天的仅保留一份。距离现在超过一个月且小于最长保留时间的，更新间隔小于一周的仅保留一份。",
     "The following items could not be synchronized.": "下列项目无法被同步。",
     "The maximum age must be a number and cannot be blank.": "最长保留时间必须为数字，且不能为空。",
     "The maximum time to keep a version (in days, set to 0 to keep versions forever).": "历史版本保留的最长天数，0为永久保存",
@@ -197,8 +197,8 @@
     "The rate limit must be a non-negative number (0: no limit)": "传输速度限制为非负整数（0 表示不限制）",
     "The rescan interval must be a non-negative number of seconds.": "扫描间隔单位为秒，且不能为负数。",
     "They are retried automatically and will be synced when the error is resolved.": "系统将会自动重试，当错误被解决时，它们将会被同步。",
-    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
-    "This is a major version upgrade.": "这是一个重大版本更新。",
+    "This can easily give hackers access to read and change any files on your computer.": "这会让骇客能够轻而易举地访问及修改您的文件",
+    "This is a major version upgrade.": "这是一个重大版本更新",
     "Trash Can File Versioning": "回收站式版本控制",
     "Unknown": "未知",
     "Unshared": "未共享",
@@ -210,14 +210,14 @@
     "Upgrading": "升级中",
     "Upload Rate": "上传速度",
     "Uptime": "已启动",
-    "Use HTTPS for GUI": "使用HTTPS连接web管理页面",
+    "Use HTTPS for GUI": "使用加密连接到图形管理页面",
     "Version": "版本",
     "Versions Path": "历史版本路径",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "超过最长保留时间，或者不满足下列条件的历史版本，将会被删除。",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "若您在本机添加新设备，记住您也必须在这个设备上添加本机。",
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "若你添加了新文件夹，记住文件夹标识是用以在不同设备间建立联系的。在不同设备间拥有相同标识的文件夹将会被同步。且文件夹标识大小写敏感。",
     "Yes": "是",
-    "You must keep at least one version.": "您必须保留至少一个版本。",
+    "You must keep at least one version.": "您必须保留至少一个版本",
     "days": "天",
     "full documentation": "完整文档",
     "items": "条目",

gui/syncthing/core/aboutModalView.html

@@ -85,6 +85,7 @@
         <li class="auto-generated">Veeti Paananen</li>
         <li class="auto-generated">Victor Buinsky</li>
         <li class="auto-generated">Vil Brekin</li>
+        <li class="auto-generated">William A. Kennington III</li>
         <li class="auto-generated">Yannic A.</li>
       </ul>
     </div>

lib/config/config.go

@@ -48,17 +48,6 @@ var (
 	// DefaultDiscoveryServers should be substituted when the configuration
 	// contains <globalAnnounceServer>default</globalAnnounceServer>.
 	DefaultDiscoveryServers = append(DefaultDiscoveryServersV4, DefaultDiscoveryServersV6...)
-
-	// DefaultDiscoveryServersIP is used by the usage reporting.
-	// XXX: Detect Android, and use this is we still don't have working DNS?
-	DefaultDiscoveryServersIP = []string{
-		"https://194.126.249.5/?id=SR7AARM-TCBUZ5O-VFAXY4D-CECGSDE-3Q6IZ4G-XG7AH75-OBIXJQV-QJ6NLQA",
-		"https://45.55.230.38/?id=AQEHEO2-XOS7QRA-X2COH5K-PO6OPVA-EWOSEGO-KZFMD32-XJ4ZV46-CUUVKAS",
-		"https://128.199.95.124/?id=VK6HNJ3-VVMM66S-HRVWSCR-IXEHL2H-U4AQ4MW-UCPQBWX-J2L2UBK-NVZRDQZ",
-		"https://[2001:470:28:4d6::5]/?id=SR7AARM-TCBUZ5O-VFAXY4D-CECGSDE-3Q6IZ4G-XG7AH75-OBIXJQV-QJ6NLQA",
-		"https://[2604:a880:800:10::182:a001]/?id=AQEHEO2-XOS7QRA-X2COH5K-PO6OPVA-EWOSEGO-KZFMD32-XJ4ZV46-CUUVKAS",
-		"https://[2400:6180:0:d0::d9:d001]/?id=VK6HNJ3-VVMM66S-HRVWSCR-IXEHL2H-U4AQ4MW-UCPQBWX-J2L2UBK-NVZRDQZ",
-	}
 )
 
 func New(myID protocol.DeviceID) Configuration {

lib/upnp/upnp.go

@@ -531,9 +531,8 @@ func (s *IGDService) AddPortMapping(localIPAddress string, protocol Protocol, ex
 	if err != nil && timeout > 0 {
 		// Try to repair error code 725 - OnlyPermanentLeasesSupported
 		envelope := &soapErrorResponse{}
-		err = xml.Unmarshal(response, envelope)
-		if err != nil {
-			return err
+		if unmarshalErr := xml.Unmarshal(response, envelope); unmarshalErr != nil {
+			return unmarshalErr
 		}
 		if envelope.ErrorCode == 725 {
 			return s.AddPortMapping(localIPAddress, protocol, externalPort, internalPort, description, 0)