Translation update

Update magic number in PROTOCOL.md

cmd/syncthing/main.go

@@ -598,7 +598,9 @@ nextRepo:
 		}()
 	}
 
-	go standbyMonitor()
+	if cfg.Options.RestartOnWakeup {
+		go standbyMonitor()
+	}
 
 	events.Default.Log(events.StartupComplete, nil)
 	go generateEvents()
@@ -1125,12 +1127,20 @@ func overrideGUIConfig(originalCfg config.GUIConfiguration, address, authenticat
 }
 
 func standbyMonitor() {
+	restartDelay := time.Duration(60 * time.Second)
 	now := time.Now()
 	for {
 		time.Sleep(10 * time.Second)
 		if time.Since(now) > 2*time.Minute {
-			l.Infoln("Paused state detected, possibly woke up from standby.")
+			l.Infoln("Paused state detected, possibly woke up from standby. Restarting in", restartDelay)
+
+			// We most likely just woke from standby. If we restart
+			// immediately chances are we won't have networking ready. Give
+			// things a moment to stabilize.
+			time.Sleep(restartDelay)
+
 			restart()
+			return
 		}
 		now = time.Now()
 	}

cmd/syncthing/monitor.go

@@ -124,7 +124,7 @@ func copyStderr(stderr io.ReadCloser) {
 				}
 
 				l.Warnf("Panic detected, writing to \"%s\"", panicFd.Name())
-				l.Warnln("Please create an issue at https://github.com/syncting/syncthing/issues/ with the panic log attached")
+				l.Warnln("Please create an issue at https://github.com/syncthing/syncthing/issues/ with the panic log attached")
 
 				panicFd.WriteString("Panic at " + time.Now().Format(time.RFC1123) + "\n")
 				stdoutMut.Lock()

config/config.go

@@ -126,6 +126,7 @@ type OptionsConfiguration struct {
 	UPnPLease          int      `xml:"upnpLeaseMinutes" default:"0"`
 	UPnPRenewal        int      `xml:"upnpRenewalMinutes" default:"30"`
 	URAccepted         int      `xml:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
+	RestartOnWakeup    bool     `xml:"restartOnWakeup" default:"true"`
 
 	Deprecated_RescanIntervalS int    `xml:"rescanIntervalS,omitempty" json:"-"`
 	Deprecated_UREnabled       bool   `xml:"urEnabled,omitempty" json:"-"`

config/config_test.go

@@ -37,6 +37,7 @@ func TestDefaultValues(t *testing.T) {
 		UPnPEnabled:        true,
 		UPnPLease:          0,
 		UPnPRenewal:        30,
+		RestartOnWakeup:    true,
 	}
 
 	cfg := New("test", node1)
@@ -128,6 +129,7 @@ func TestOverriddenValues(t *testing.T) {
 		UPnPEnabled:        false,
 		UPnPLease:          60,
 		UPnPRenewal:        15,
+		RestartOnWakeup:    false,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", node1)

config/testdata/overridenvalues.xml

@@ -15,5 +15,6 @@
         <upnpEnabled>false</upnpEnabled>
         <upnpLeaseMinutes>60</upnpLeaseMinutes>
         <upnpRenewalMinutes>15</upnpRenewalMinutes>
+        <restartOnWakeup>false</restartOnWakeup>
     </options>
 </configuration>

discover/PROTOCOL.md

@@ -36,7 +36,7 @@ The Announcement packet has the following structure:
      0                   1                   2                   3
      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                      Magic (0x029E4C77)                       |
+    |                      Magic (0x9D79BC39)                       |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     /                                                               /
     \                        Node Structure                         \
@@ -121,7 +121,7 @@ The Query packet has the following structure:
      0                   1                   2                   3
      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |                   Magic Number (0x23D63A9A)                   |
+    |                   Magic Number (0x2CA856F5)                   |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                       Length of Node ID                       |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

gui/index.html

@@ -165,6 +165,8 @@
           </div>
         </div>
         <button class="btn btn-sm btn-default pull-right" ng-click="addRepo()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Repository</span></button>
+        <div class="clearfix"></div>
+        <hr class="visible-sm"/>
       </div>
 
       <!-- Node list (top right) -->
@@ -219,8 +221,8 @@
 
         <div class="panel-group" id="nodes">
           <div class="panel panel-{{nodeClass(nodeCfg)}}" ng-repeat="nodeCfg in otherNodes()">
-            <div class="panel-heading">
-              <h3 class="panel-title" data-toggle="collapse" data-parent="#nodes" href="#node-{{$index}}" style="cursor: pointer">
+            <div class="panel-heading" data-toggle="collapse" data-parent="#nodes" href="#node-{{$index}}" style="cursor: pointer">
+              <h3 class="panel-title">
                 <span class="glyphicon glyphicon-retweet"></span>&emsp;{{nodeName(nodeCfg)}}
                 <span class="pull-right hidden-xs">
                   <span ng-if="connections[nodeCfg.NodeID] && completion[nodeCfg.NodeID]._total == 100">
@@ -278,6 +280,7 @@
           </div>
         </div>
         <button class="btn btn-sm btn-default pull-right" ng-click="addNode()"><span class="glyphicon glyphicon-plus"></span>&emsp;<span translate>Add Node</span></button>
+        <div class="clearfix"></div>
       </div>
     </div> <!-- /row -->
 

gui/lang/lang-de.json

@@ -37,7 +37,7 @@
     "Global Repository": "Globales Verzeichnis",
     "Idle": "Untätig",
     "Ignore Permissions": "Berechtigungen ignorieren",
-    "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Eingehendes Datenratelimit (KiB/s)",
     "Keep Versions": "Versionen erhalten",
     "Last seen": "Zuletzt online",
     "Latest Release": "Letzte Veröffentlichung",

gui/lang/lang-pt-PT.json

@@ -37,7 +37,7 @@
     "Global Repository": "Repositório global",
     "Idle": "Em espera",
     "Ignore Permissions": "Ignorar permissões",
-    "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Limite de velocidade de recepção (KiB/s)",
     "Keep Versions": "Manter versões",
     "Last seen": "Última vez que foi verificado",
     "Latest Release": "Última versão",

gui/lang/lang-sv.json

@@ -37,7 +37,7 @@
     "Global Repository": "Global lagring",
     "Idle": "Vilande",
     "Ignore Permissions": "Ignorera filrättigheter",
-    "Incoming Rate Limit (KiB/s)": "Max nerladdningshastighet (KiB/s)",
+    "Incoming Rate Limit (KiB/s)": "Max nedladdningshastighet (KiB/s)",
     "Keep Versions": "Behåll versioner",
     "Last seen": "Senast online",
     "Latest Release": "Senaste version",

protocol/PROTOCOL.md

@@ -99,7 +99,10 @@ The Compression bit "C" indicates the compression used for the message.
 For C=1:
 
   * The Length field contains the length, in bytes, of the
-    compressed message data.
+    compressed message data plus a four byte uncompressed length field.
+
+  * The compressed message data is preceeded by a 32 bit field denoting
+    the length of the uncompressed message.
 
   * The message data is compressed using the LZ4 format and algorithm
     described in https://code.google.com/p/lz4/.

versioner/staggered.go

@@ -59,6 +59,9 @@ func versionExt(path string) string {
 // Rename versions with old version format
 func (v Staggered) renameOld() {
 	err := filepath.Walk(v.versionsPath, func(path string, f os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
 		if f.Mode().IsRegular() {
 			versionUnix, err := strconv.ParseInt(strings.Replace(filepath.Ext(path), ".v", "", 1), 10, 0)
 			if err == nil {