diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index c6bcac49e..ad3aae684 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -327,7 +327,7 @@
BuddyFilter
- Person:
+ Person
@@ -406,7 +406,7 @@
CloudStorageAuthenticate
-
+ Cloud account verification required, enter PIN in preferences
@@ -3502,110 +3502,110 @@ p, li { white-space: pre-wrap; }
DivelogsDeWebServices
-
+ no dives were selected
-
+ stylesheet to export to divelogs.de is not found
-
+ failed to create zip file for upload: %s
-
+ internal error
-
+ Conversion of dive %1 to divelogs.de format failed
-
+ error writing zip file: %s zip error %d system error %d - %s
-
-
+
+ Done
-
+ Uploading dive list...
-
+ Downloading dive list...
-
+ Downloading %1 dives...
-
+ Download finished - %1
-
+ Problem with download
-
+ The archive could not be opened:
-
+ Corrupted download
-
+ The archive could not be opened:
%1
-
+ Upload finished
-
+ Upload failed
-
+ Upload successful
-
+ Login failed
-
+ Cannot parse response
-
+ Error: %1
@@ -4135,7 +4135,7 @@ p, li { white-space: pre-wrap; }
LocationFilter
- Location:
+ Location
@@ -4530,409 +4530,404 @@ p, li { white-space: pre-wrap; }
-
+ &Edit
-
+ Share on
-
+ &New logbook
-
+ New
-
+ &Open logbook
-
-
+
+ Open
-
+ &Save
-
+ Save
-
+ Sa&ve as
-
+ Save as
-
+ &Close
-
+ Close
-
+ &Print
-
+ P&references
-
+ &Quit
-
+ Import from &dive computer
-
- Import &GPS data from Subsurface web service
-
-
-
-
+ Edit device &names
-
+ &Add dive
-
+ &Edit dive
-
+ &Copy dive components
-
+ &Paste dive components
-
+ &Renumber
-
+ Auto &group
-
+ &Yearly statistics
-
+ &Dive list
-
+ &Profile
-
+ &Info
-
+ &All
-
+ P&revious DC
-
+ &Next DC
-
+ &About Subsurface
-
+ User &manual
-
+ &Map
-
+ P&lan dive
-
+ &Import log files
-
+ Import divelog files from other applications
-
+ Import &from divelogs.de
-
+ &Full screen
-
+ Toggle full screen
-
+ &Check for updates
-
+ &Export
-
+ Export dive logs
-
+ Configure &dive computer
-
+ Edit &dive in planner
-
+ Toggle pO₂ graph
-
+ Toggle pN₂ graph
-
+ Toggle pHe graph
-
+ Toggle DC reported ceiling
-
+ Toggle calculated ceiling
-
+ Toggle calculating all tissues
-
+ Toggle calculated ceiling with 3m increments
-
+ Toggle heart rate
-
+ Toggle MOD
-
+ Toggle EAD, END, EADD
-
+ Toggle NDL, TTS
-
+ Toggle SAC rate
-
+ Toggle ruler
-
+ Scale graph
-
+ Toggle media
-
+ &Find moved media files
-
+ Toggle gas bar
-
+ &Filter divelist
-
+ Toggle tissue heat-map
-
+ User &survey
-
-
+
+ &Undo
-
-
+
+ &Redo
-
+ Open c&loud storage
-
+ Save to clo&ud storage
-
+ &Manage dive sites
-
+ Dive Site &Edit
-
+ Facebook
-
+ Cloud storage online
-
-
+
+ Connect to
-
+ Disconnect from
-
-
-
+
+
+ Please save or cancel the current dive edit before opening a new file.
-
+ Open file
-
-
+
+ Cancel
-
-
-
-
-
+
+
+
+
+ Warning
@@ -4942,12 +4937,12 @@ p, li { white-space: pre-wrap; }
-
+ Template backup created
-
+ The following backup printing templates were created:
%1
@@ -4961,212 +4956,212 @@ can overwrite them on startup.
-
+ Please save or cancel the current dive edit before going online
-
+ You have unsaved changes. Do you want to commit them to the cloud storage?
If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".
-
+ Failure taking cloud storage online
-
+ Please save or cancel the current dive edit before closing the file.
-
+ Please save or cancel the current dive edit before trying to add a dive.
-
+ Print runtime table
-
+ Trying to replan a dive that's not a planned dive.
-
+ Please, first finish the current edition before trying to do another.
-
+ Yearly statistics
-
-
+
+ Dive log files
-
-
-
+
+
+ Subsurface files
-
-
+
+ Cochran
+
+
+
+ DiveLogs.de
+
+
+
+
+
+ JDiveLog
+
+
+
+
+
+ Liquivision
+
+
+
+
+
+ Suunto
+
+
- DiveLogs.de
+ UDCF
- JDiveLog
+ UDDF
- Liquivision
+ XML
- Suunto
+ Divesoft
- UDCF
+ Datatrak/WLog
- UDDF
+ MkVI files
- XML
+ APD log viewer
- Divesoft
+ OSTCtools
- Datatrak/WLog
-
-
-
-
-
- MkVI files
-
-
-
-
-
- APD log viewer
-
-
-
-
-
- OSTCtools
-
-
-
-
- DAN DL7
-
+ CSV
-
+ All files
-
+ Do you want to save the changes that you made in the file %1?
-
+ Do you want to save the changes that you made in the data file?
-
-
+
+ Save changes?
-
+ Changes will be lost if you don't save them.
-
+ Save file as
-
+ [local cache for] %1
-
+ [cloud storage for] %1
-
+ Opening datafile from older version
-
+ You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.
-
+ Open dive log file
-
+ Contacting cloud service...
@@ -5485,22 +5480,22 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
-
+ General
-
+ Open default log file
-
+ Subsurface files
-
+ Select ffmpeg executable
@@ -5846,7 +5841,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString
-
+ Subsurface cloud storage
@@ -5871,73 +5866,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString
-
- Subsurface web service
-
-
-
-
- Default user ID
-
-
-
-
- Save user ID locally?
-
-
-
-
+ Network
-
+ No proxy
-
+ System proxy
-
+ HTTP proxy
-
+ SOCKS proxy
-
+ Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.
-
+ Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.
-
-
+
+ Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.
-
+ Subsurface cloud storage (credentials verified)
-
+ Subsurface cloud storage (incorrect password)
-
+ Subsurface cloud storage (PIN required)
@@ -6399,146 +6379,146 @@ Please export this template to a different file.
QMLManager
-
+ Starting...
-
+ Open local dive data file
-
+ Opening local data file failed
-
+ %1 dives loaded from local dive data file
-
+ working in no-cloud mode
-
+ Error parsing local storage, giving up
-
+ no cloud credentials
-
-
+
+ Please enter valid cloud credentials.
-
+ Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.
-
+ Invalid format for email address
-
+ Attempting to open cloud storage with new credentials
-
+ Testing cloud credentials
-
+ No response from cloud server to validate the credentials
-
+ Incorrect cloud credentials
-
+ Cannot connect to cloud storage - cloud account not verified
-
+ Cloud credentials are invalid
-
+ Cannot open cloud storage: Error creating https connection
-
+ Cannot open cloud storage: %1
-
+ Cannot connect to cloud storage
-
+ Cloud credentials valid, loading dives...
-
+ Cloud storage error: %1
-
+ Loading dives from local storage ('no cloud' mode)
-
+ Failed to connect to cloud server, reverting to no cloud status
-
+ Cloud storage open successfully. No dives in dive list.
-
-
+
+ h
-
-
-
+
+
+ min
-
+ sec
-
+ Unknown GPS location
@@ -6546,7 +6526,7 @@ Please export this template to a different file.
QMLPrefs
-
+ Starting...
@@ -7162,59 +7142,11 @@ Files with inappropriate date/time
-
- SubsurfaceWebServices
-
-
- Enter User ID and click Download
-
-
-
-
- Webservice
-
-
-
-
- Connecting...
-
-
-
-
- Download finished
-
-
-
-
- Download error: %1
-
-
-
-
- Connection error:
-
-
-
-
- Invalid user identifier!
-
-
-
-
- Cannot parse response!
-
-
-
-
- Download successful
-
-
-SuitFilter
- Suits:
+ Suits
@@ -7556,7 +7488,7 @@ mixed from Air and using:
TagFilter
- Tags:
+ Tags
@@ -8241,12 +8173,12 @@ Language: %1
-
+ Operation timed out
-
+ Transferring data...
@@ -8941,123 +8873,123 @@ Maximum
-
+ Checkout from storage (%lu/%lu)
-
+ Transfer from storage (%d/%d)
-
+ Transfer to storage (%d/%d)
-
+ Local cache directory %s corrupted - can't sync with Subsurface cloud storage
-
-
+
+ Could not update local cache to newer remote data
-
+ Subsurface cloud storage corrupted
-
+ Could not update Subsurface cloud storage, try again later
-
+ Remote storage and local data diverged. Error: merge failed (%s)
-
+ Remote storage and local data diverged. Cannot combine local and remote changes
-
+ Remote storage and local data diverged
-
+ Remote storage and local data diverged. Error: writing the data failed (%s)
-
+ Problems with local cache of Subsurface cloud data
-
+ Moved cache data to %s. Please try the operation again.
-
+ Update local storage to match cloud storage
-
+ Push local changes to cloud storage
-
+ Try to merge local changes into cloud storage
-
+ Store data into cloud storage
-
+ Sync with cloud storage
-
+ Can't reach cloud server, working with local data
-
+ Successful cloud connection, fetch remote
-
+ Done syncing with cloud storage
-
+ Error connecting to Subsurface cloud storage
-
+ git clone of %s failed (%s)
-
+ Synchronising data file
@@ -9280,25 +9212,25 @@ You can create this logfile by selecting the corresponding checkbox in the downl
-
+ multiple GPS locations for this dive site; also %s
-
+ additional name for site: %s
-
+ Load dives from local cache
-
+ Successfully opened dive data
@@ -9320,12 +9252,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl
-
+ Failed to parse '%s'
-
+ Can't open stylesheet %s
@@ -10068,8 +10000,8 @@ EADD: %d%s / %.1fg/ℓ
-
-
+
+ Notes
@@ -10265,62 +10197,62 @@ EADD: %d%s / %.1fg/ℓ
-
+ Jan
-
+ Feb
-
+ Mar
-
+ Apr
-
+ May
-
+ Jun
-
+ Jul
-
+ Aug
-
+ Sep
-
+ Oct
-
+ Nov
-
+ Dec
@@ -10602,77 +10534,77 @@ Is the Uemis Zurich plugged in correctly?
-
+ Built
-
+ Sank
-
+ Sank Time
-
+ Reason
-
+ Nationality
-
+ Shipyard
-
+ ShipType
-
+ Length
-
+ Beam
-
+ Draught
-
+ Displacement
-
+ Cargo
-
+ Wreck Data
-
+ Altitude
-
+ Depth
@@ -10717,22 +10649,22 @@ Is the Uemis Zurich plugged in correctly?
-
+ Start saving data
-
+ Start saving dives
-
+ Done creating local cache
-
+ Preparing to save data
@@ -10752,7 +10684,7 @@ Is the Uemis Zurich plugged in correctly?
-
+ Don't save an empty log to the cloud
@@ -10772,22 +10704,22 @@ Is the Uemis Zurich plugged in correctly?
-
+ Invalid response from server
-
+ Expected XML tag 'DiveDateReader', got instead '%1
-
+ Expected XML tag 'DiveDates' not found
-
+ Malformed XML response. Line %1: %2
@@ -10820,12 +10752,12 @@ Is the Uemis Zurich plugged in correctly?
-
+ Disable location service
-
+ Settings
@@ -10855,57 +10787,47 @@ Is the Uemis Zurich plugged in correctly?
-
+ Help
-
-
- Upload GPS data
-
- Apply GPS fixes
-
- Download GPS data
-
-
-
-
+ Show GPS fixes
-
+ Clear GPS cache
-
+ Developer
-
+ App log
-
+ Theme information
-
+ About
-
+ Run location service