diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-10 06:28:41 +0100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-12-10 06:28:41 +0100 |
| commit | 5e1cfd96fde07400fe6571bd4b8bda67199c3dd3 (patch) | |
| tree | b655cd2726b254f000a3b472a422868811d8b435 /translations | |
| parent | e5561d766852cde28ebbabf2150bab5be6183897 (diff) | |
| download | subsurface-5e1cfd96fde07400fe6571bd4b8bda67199c3dd3.tar.gz | |
Pulled latest translations
As always, I didn't author these, just did the pull from Transifex.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
23 files changed, 6616 insertions, 5812 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index b055f219a..c2b8a2a90 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Модел</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Прякор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation type="unfinished"/> </message> @@ -324,12 +334,12 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation type="unfinished"/> @@ -338,37 +348,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Въздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -376,17 +386,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -394,67 +404,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>макс CNS</translation> </message> @@ -462,71 +472,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -852,22 +886,22 @@ Please, remove them first.</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>И</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>З</translation> </message> @@ -974,7 +1008,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation type="unfinished"/> </message> @@ -1004,112 +1038,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Профил</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1124,174 +1158,174 @@ Please, remove them first.</source> <translation>Настройки</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Предишен ГК</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Следващ ГК</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Избери събития</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Въведи план</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>За Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Отвори файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Ръководство за потребителя</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1591,22 +1625,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1806,70 +1840,70 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Редактирай</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>въздух</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Връщане към OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> край</translation> @@ -1878,72 +1912,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1956,7 +1990,7 @@ Please, remove them first.</source> <translation>Въздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2053,42 +2087,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Уеб услуга</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Свръзване...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Грешка при връзка: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Грешен потребителски ключ</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Не може да бъде напревен разряд!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Успешно изтегляне!</translation> </message> @@ -2104,17 +2138,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>бара</translation> </message> @@ -2122,7 +2156,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2130,12 +2164,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>кг</translation> </message> @@ -2144,7 +2178,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2178,12 +2212,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2191,17 +2225,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2209,70 +2243,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2344,9 +2378,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2380,10 +2414,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Не може да бъде прочетен '%s'</translation> </message> @@ -2394,8 +2428,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2672,23 +2706,23 @@ Maximum</source> <translation>Не може да бъде зареден стилов файл (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Не може да бъде намерен газ %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Твърде много газови смеси</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2701,42 +2735,42 @@ Subsurface планиране </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Превключи газ на %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Консумация на газ: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s от %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_ca_ES.ts b/translations/subsurface_ca_ES.ts index 9785c96e7..e37436b84 100644 --- a/translations/subsurface_ca_ES.ts +++ b/translations/subsurface_ca_ES.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation type="unfinished"/> </message> @@ -324,12 +334,12 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation type="unfinished"/> @@ -338,37 +348,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -376,17 +386,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -394,67 +404,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation type="unfinished"/> </message> @@ -462,71 +472,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -852,22 +886,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation type="unfinished"/> </message> @@ -974,7 +1008,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation type="unfinished"/> </message> @@ -1004,112 +1038,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1124,174 +1158,174 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1591,22 +1625,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1806,70 +1840,70 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation type="unfinished"/> @@ -1878,72 +1912,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1956,7 +1990,7 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2053,42 +2087,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation type="unfinished"/> </message> @@ -2104,17 +2138,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation type="unfinished"/> </message> @@ -2122,7 +2156,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2130,12 +2164,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation type="unfinished"/> </message> @@ -2144,7 +2178,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2178,12 +2212,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2191,17 +2225,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2209,70 +2243,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2344,9 +2378,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2380,10 +2414,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation type="unfinished"/> </message> @@ -2394,8 +2428,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2667,23 +2701,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2692,37 +2726,37 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index f3433c3fb..327809840 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik vil fjerne flasken</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Flasken kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne flaske er i brug. Kun flasker som ikke er i brug kan slettes</translation> </message> @@ -153,22 +153,22 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Enheds ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Kaldenavn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klik her, vil fjerne denne dykkercomputer</translation> </message> @@ -176,12 +176,12 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -189,87 +189,97 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Vis søgebox</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>Vis alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>Skjul alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>Saml andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>Fjern dyk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>Lav ny tur over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>Tilføj dyk til tur umiddelbart over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>Flet tur med tur over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>Flet tur med tur under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Gem som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Exporter som UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>Skift tider</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Gem dyk som...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>Flet valgte dyk</translation> </message> @@ -325,12 +335,12 @@ fjerne den valgte dykkercomputer?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Handler Position Error</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Et eller flere af dine stop vil gå tabt ved denne handling, @@ -340,37 +350,37 @@ slet dem venligst først.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Slut Dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Brugt Gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Punkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation> Kassér Planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Du er ved kassére din plan.</translation> </message> @@ -378,17 +388,17 @@ slet dem venligst først.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Dive Planner Points</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Gasser tilrådighed</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>Tilføj dykker data point</translation> </message> @@ -396,67 +406,67 @@ slet dem venligst først.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>Position</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>MaxCNS</translation> </message> @@ -464,71 +474,95 @@ slet dem venligst først.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Ugyldigt svar fra serveren</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Forventet XML tag 'DiveDateReader', fik istedet '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Forventet XML tag 'DiveDates' ikke fundet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> + <translation>Ugyldig XML svar. Linje %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -854,22 +888,22 @@ slet dem venligst først.</translation> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>V</translation> </message> @@ -976,7 +1010,7 @@ slet dem venligst først.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importer filer</translation> </message> @@ -1006,112 +1040,112 @@ slet dem venligst først.</translation> <translation>Ctrl+</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Afslut</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importer fra &dive computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importer %GPS data fra Subsurface services</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Edit Enheds navne</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Renumber</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Vælg %Zoom</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Yearly Statistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Dyk liste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Alt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>Bruger &Manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&lan Dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importer CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importer CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importer fra Divelog.de</translation> </message> @@ -1126,174 +1160,174 @@ slet dem venligst først.</translation> <translation>Indstillinger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Tilføj Dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Auto Gruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Forrige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Næste DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Højre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Vælg hændelser</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Input Plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Åben fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Gem eller Fortryd venligst denne rettelse før du lukker filen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Gem eller fortryd venligst dette dyk før du laver en dykkerplan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Brugermanual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Kan ikke finde Subsurface manualen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Vil du gemme ændringerne du lavede i %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Vil du gemme ændringerne du lavede i datafilen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Ændringer vil blive tabt hvis du ikke gemmer dem.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Færdiggør først dette dyk før du laver et nyt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> @@ -1593,22 +1627,22 @@ slet dem venligst først.</translation> <translation>GFHøj</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Åben standard log fil</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> @@ -1808,70 +1842,70 @@ slet dem venligst først.</translation> <translation>Varighed: 10 minutter</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Skaler</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Målestok</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Mål præferencer for dykker segmentet</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Skaler dykket til skræmstørrelsen</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Rediger</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Bailing out to OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -1880,72 +1914,72 @@ slet dem venligst først.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Varighed: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gas brugt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Noter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Sigt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -1958,7 +1992,7 @@ slet dem venligst først.</translation> <translation>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Fjern dette punkt</translation> </message> @@ -2055,42 +2089,42 @@ slet dem venligst først.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Forbinder...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Forbindelses fejl:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Ugyldig bruger navn</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Kan ikke fortolke svar!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Download succes!</translation> </message> @@ -2106,17 +2140,17 @@ slet dem venligst først.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2158,7 @@ slet dem venligst først.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Information</translation> </message> @@ -2132,12 +2166,12 @@ slet dem venligst først.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2180,8 @@ slet dem venligst først.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Download positions data</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,12 +2214,12 @@ slet dem venligst først.</translation> <translation>Upload</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2193,17 +2227,17 @@ slet dem venligst først.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Klik her, vil fjerne dette vægtsystem</translation> </message> @@ -2211,79 +2245,79 @@ slet dem venligst først.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>År >Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Varighed Ialt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Længst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2390,9 @@ Gennemsnit</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2426,10 @@ Gennemsnit</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Fejl i læsning af '%s'</translation> </message> @@ -2406,8 +2440,8 @@ Gennemsnit</translation> <translation>Kunne ikke læse '%s'. Brug omport for CSV filer.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximum antal of kolonner i CSV import er %d</translation> </message> @@ -2684,23 +2718,23 @@ Gennemsnit</translation> <translation>Kan ikke åbne layoutfil (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Kan ikke finde gas %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>For mange gas blandinger</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,35 +2747,35 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎ </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Skift til %.*f %s om %d:%02d min - runtime %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Stop på %.*f %s i %d:%02d min - runtime %d:%02u i %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Skift gas til %s⏎ </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gasforbrug: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s of %s⏎ @@ -2749,7 +2783,7 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎ </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 1f814f6cc..781ad1626 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Suchfeld anzeigen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>Alle ausklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>Alle einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>Entferne Tauchgang aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zum Trip darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>Reise mit der Reise darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>Reise mit der Reise darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>Tauchgang löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Als UDDF exportieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Speichere Tauchgänge als...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Datei speichern als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> @@ -324,12 +334,12 @@ <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Problematische Position des Knotens</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen. @@ -339,37 +349,37 @@ Bitte entferne diese zuerst.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Plan verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -377,17 +387,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Planerpunkte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Verfügbare Gase</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>Datenpunkt hinzufügen</translation> </message> @@ -395,67 +405,67 @@ Bitte entferne diese zuerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>Tauchplatz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -463,71 +473,95 @@ Bitte entferne diese zuerst.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -853,22 +887,22 @@ Bitte entferne diese zuerst.</translation> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -975,7 +1009,7 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Dateien importieren</translation> </message> @@ -1005,112 +1039,112 @@ Bitte entferne diese zuerst.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>&GPS Daten vom Subsurface Service importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>Gerätenamen &bearbeiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>&Zoom ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Bedienungsanleitung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Tauchgang p&lanen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>CSV importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>CS&V importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>von Divelogs.de importieren</translation> </message> @@ -1125,174 +1159,174 @@ Bitte entferne diese zuerst.</translation> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>automatisch gruppieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Ereignisse auswählen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Plan eingeben</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Info zu Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Kann das Subsurface Handbuch nicht finden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Datei speichern als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> @@ -1592,22 +1626,22 @@ Bitte entferne diese zuerst.</translation> <translation>GF high</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Standard Logfile öffnen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> @@ -1807,70 +1841,70 @@ Bitte entferne diese zuerst.</translation> <translation>Setze Dauer: 10 Minuten</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Massstab</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Lineal</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Eigenschaften der Tauchgangssegmente messen</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Tauchgang auf Bildschirmgrösse skalieren</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO₂</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Notausstieg mit offenem System</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -1879,72 +1913,72 @@ Bitte entferne diese zuerst.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Gewichte:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -1957,7 +1991,7 @@ Bitte entferne diese zuerst.</translation> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Diesen Punkt entfernen</translation> </message> @@ -2054,42 +2088,42 @@ Bitte entferne diese zuerst.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Verbinde...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Verbindungsfehler: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Ungültige Benutzerkennung</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Verstehe die Antwort nicht!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Erfolgreich geladen!</translation> </message> @@ -2105,17 +2139,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2123,7 +2157,7 @@ Bitte entferne diese zuerst.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Information</translation> </message> @@ -2131,12 +2165,12 @@ Bitte entferne diese zuerst.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2145,8 +2179,8 @@ Bitte entferne diese zuerst.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Standortdaten herunterladen</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2179,12 +2213,12 @@ Bitte entferne diese zuerst.</translation> <translation>Hochladen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2192,17 +2226,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> @@ -2210,79 +2244,79 @@ Bitte entferne diese zuerst.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2355,9 +2389,9 @@ Mittel</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2391,10 +2425,10 @@ Mittel</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> @@ -2405,8 +2439,8 @@ Mittel</translation> <translation>'%s' lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> @@ -2683,23 +2717,23 @@ Mittel</translation> <translation>Fehler beim Öffnen des Styleshhets (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Kann Gasgemisch %d/%d nicht finden</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2712,42 +2746,42 @@ basierend auf GFlow = %.0f und GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Gaswechsel zu %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gasverbrauch: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 71de37503..e1dbdc704 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -115,17 +115,17 @@ <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Suchfeld anzeigen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>Alle ausklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>Alle einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>Entferne Tauchgang aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zum Trip darüber hinzufügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>Reise mit der Reise darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>Reise mit der Reise darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>Tauchgang löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>Kennzeichne Tauchgang(gänge) als ungültig</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Speichern unter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Als UDDF exportieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>Tauchgang(gänge) auf divelogs.de hochladen</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Speichere Tauchgänge als...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Datei speichern als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> @@ -324,12 +334,12 @@ <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Problematische Position des Knotens</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Einer oder mehrere Deiner Stopps werden hierdurch verloren gehen. @@ -339,37 +349,37 @@ Bitte entferne diese zuerst.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Plan verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -377,17 +387,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Planerpunkte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Verfügbare Gase</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>Datenpunkt hinzufügen</translation> </message> @@ -395,67 +405,67 @@ Bitte entferne diese zuerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>Tauchplatz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -463,74 +473,97 @@ Bitte entferne diese zuerst.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation>Ungültige Serverantwort</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>%1 anstelle des erwarteten XML Tags 'DiveDateReader'.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML Tag 'DiveDates' nicht gefunden.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation>Ungültige XML Antwort. Zeile %1: %2</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>Kann DLD Datei nicht erstellen</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Fertig</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation>Übertrage Liste der Tauchgänge</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation>Das Archiv entält beschädigte Daten -%1</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>Übertragung fehlgeschlagen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation>Übertragung beendet</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Übertragung erfolgreich</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation>Fehler beim Herunterladen: %1</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>Login fehlgeschlagen</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>Verstehe die Antwort nicht</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Fehler: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Übertragung beendet</translation> </message> </context> <context> @@ -813,7 +846,7 @@ Bitte entferne diese zuerst.</translation> <location filename="../qt-ui/maintab.cpp" line="386"/> <location filename="../qt-ui/maintab.cpp" line="410"/> <source>Trip Notes</source> - <translation>Reise Notizen</translation> + <translation>Reisenotizen</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="37"/> @@ -855,22 +888,22 @@ Bitte entferne diese zuerst.</translation> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -977,7 +1010,7 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Dateien importieren</translation> </message> @@ -1007,112 +1040,112 @@ Bitte entferne diese zuerst.</translation> <translation>Strg+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Von &Tauchcomputer importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>&GPS Daten vom Subsurface Service importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Strg+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>Gerätenamen &bearbeiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Strg++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Strg+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>&Zoom ein-/ausschalten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Jahresstatistiken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Strg+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informationen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Bedienungsanleitung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Tauchgang p&lanen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Strg+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>CSV importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>CS&V importieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>von Divelogs.de importieren</translation> </message> @@ -1127,174 +1160,174 @@ Bitte entferne diese zuerst.</translation> <translation>Einstellungen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Strg+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Strg+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Tauchgang hinzufügen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> - <translation>automatisch gruppieren</translation> + <translation>Automatisch gruppieren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Strg+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Strg+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Strg+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Strg+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Vorh. TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Nächster TC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Ereignisse auswählen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Plan eingeben</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Über Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Strg+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor das Logbuch geschlossen werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchplan bearbeitet werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Benutzerhandbuch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Kann das Subsurface Handbuch nicht finden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein anderer Tauchgang bearbeitet werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> - <translation>Datei speichern als</translation> + <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF Dateien (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> @@ -1489,7 +1522,7 @@ Bitte entferne diese zuerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="453"/> <source>Ascent/Descent speed denominator</source> - <translation>Zeiteinheit für Geschwindigkeit bei Abstieg/Aufstieg</translation> + <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="460"/> @@ -1594,22 +1627,22 @@ Bitte entferne diese zuerst.</translation> <translation>GF high</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation>Bitte Programm neu starten</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Standard Logfile öffnen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> @@ -1809,70 +1842,70 @@ Bitte entferne diese zuerst.</translation> <translation>Setze Dauer: 10 Minuten</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Maßstab</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Lineal</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Eigenschaften der Tauchgangssegmente messen</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Tauchgang auf Bildschirmgrößem skalieren</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation>PN₂</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation>PHe</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO₂</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Notausstieg mit offenem System</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -1881,72 +1914,72 @@ Bitte entferne diese zuerst.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>AMV:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Tauchgruppenleiter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -1959,7 +1992,7 @@ Bitte entferne diese zuerst.</translation> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Diesen Punkt entfernen</translation> </message> @@ -2056,42 +2089,42 @@ Bitte entferne diese zuerst.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Verbinde...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation>Herunterladen beendet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation>Fehler beim Herunterladen: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Verbindungsfehler: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Ungültige Benutzerkennung</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Verstehe die Antwort nicht!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Erfolgreich geladen!</translation> </message> @@ -2107,17 +2140,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2125,7 +2158,7 @@ Bitte entferne diese zuerst.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Information</translation> </message> @@ -2133,12 +2166,12 @@ Bitte entferne diese zuerst.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2147,8 +2180,8 @@ Bitte entferne diese zuerst.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Standortdaten herunterladen</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2181,12 +2214,12 @@ Bitte entferne diese zuerst.</translation> <translation>Hochladen</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation>Die Aktion hat zu lange gedauert</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation>Übertrage Daten...</translation> </message> @@ -2194,17 +2227,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> @@ -2212,79 +2245,79 @@ Bitte entferne diese zuerst.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) - Durchschnitt</translation> +Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>AMV (%1) - Durchschnitt</translation> +Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2357,9 +2390,9 @@ Mittel</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2393,10 +2426,10 @@ Mittel</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> @@ -2407,8 +2440,8 @@ Mittel</translation> <translation>'%s' lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> @@ -2685,23 +2718,23 @@ Mittel</translation> <translation>Fehler beim Öffnen des Styleshhets (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Kann Gasgemisch %d/%d nicht finden</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Zu viele Gasgemische</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2714,42 +2747,42 @@ basierend auf GFlow = %.0f und GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Tauchen auf %.*f %s in %d:%02d min - Gesamtzeit %d:%02u mit %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Gaswechsel zu %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gasverbrauch: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 7562009f9..743c4f66e 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Pulsar aquí borrará esta botella</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>La botella no puede borrarse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gas en uso. Solo pueden borrarse botellas que no se usan en la inmersión.</translation> </message> @@ -153,22 +153,22 @@ ordenador seleccionado ?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>ID del dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Nombre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Pulsar aquí borrará este ordenador de buceo.</translation> </message> @@ -176,12 +176,12 @@ ordenador seleccionado ?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>Pie³/min</translation> </message> @@ -189,87 +189,97 @@ ordenador seleccionado ?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Mostrar ventana de busqueda</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>Expandir todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>Encoger todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>Encoger otros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>Borrar inmersión(es) del viaje</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>Crear nuevo viaje arriba</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>Añadir inmersión(es) al viaje de arriba</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>mezclar viaje con el viaje de arriba</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>mezclar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>Marcar inmersión(es) como inválida</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Guardar como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Exportar como UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>Desplazar horas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>Subir inmersión(es) a divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Guardar las inmersiones como ...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Archivos UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> @@ -325,12 +335,12 @@ ordenador seleccionado ?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Error en la posición del punto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Una o más de tus paradas se perderán con estas operaciones. @@ -340,37 +350,37 @@ Por favor, bórralas antes.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>AIRE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Profundidad final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>¿ Descartar el plan ?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Vas a descartar tu plan.</translation> </message> @@ -378,17 +388,17 @@ Por favor, bórralas antes.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Puntos del planificador de inmersiones</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Gases disponibles</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>Añadir punto de datos de inmersión.</translation> </message> @@ -396,67 +406,67 @@ Por favor, bórralas antes.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -464,72 +474,97 @@ Por favor, bórralas antes.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Respuesta del servidor no válida.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Etiqueta XML esperada 'DiveDateReader'. Obtenida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Etiqueta XML esperada 'DiveDates' no encontrada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> + <translation>Respuesta XML mal formada. Línea </translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>No se pudo crear el fichero DLD </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Hecho</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> - <translation type="unfinished"/> + <translation>Subiendo lista de inmersiones ...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Descargando lista de inmersiones ...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>Descargando %1 inmersiones ...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Descarga finalizada - </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Descarga corrompida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>El archivo no pudo abrirse +%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>La subida ha fallado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Subida correcta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>El acceso ha fallado</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>No se puede leer la respuesta</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Error: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Subida finalizada</translation> </message> </context> <context> @@ -854,22 +889,22 @@ Por favor, bórralas antes.</translation> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>O</translation> </message> @@ -976,7 +1011,7 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importar Archivos</translation> </message> @@ -1006,112 +1041,112 @@ Por favor, bórralas antes.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importar del or&denador de buceo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importar datos &GPS del Servicio Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Editar nombres de dispositivos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Activar &Zoom</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Lista de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Manual de usuario</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globo </translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&lanificar Inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importar CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importar CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importar desde Divelogs.de</translation> </message> @@ -1126,174 +1161,174 @@ Por favor, bórralas antes.</translation> <translation>Preferencias</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Añadir inmersión</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Auto agrupar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Anterior ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Izquierda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Siguiente ordenador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Derecha</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Seleccionar eventos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Introducir Plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Acerca de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar planificar otra.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Manual de usuario</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>No puedo encontrar el manual de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>¿ Quieres guardar los cambios que has hecho en el archivo %1 ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>¿ Quieres guardar los cambios que has hecho en el archivo de datos ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>¿Guardar los cambios?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Los cambios se perderán si no los guardas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Termina primero la edición actual antes de intentar editar otra.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Archivos UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Lenguaje</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>metro</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>pie</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>litro</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>pie³</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,17 +1473,17 @@ Por favor, bórralas antes.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Predeterminado del sistema</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1525,12 +1560,12 @@ Por favor, bórralas antes.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>max ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> <source>EAD END EADD</source> - <translation>PEA PNE EADD</translation> + <translation>PEA PEN EADD</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="681"/> @@ -1593,22 +1628,22 @@ Por favor, bórralas antes.</translation> <translation>GF alto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Reinicio requerido</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>Para cargar correctamente un nuevo lenguaje debes reiniciar Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Abrir archivo de registro por defecto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1653,17 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>&Previsualizar</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Imp&rimir</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>&Cerrar</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1808,70 +1843,70 @@ Por favor, bórralas antes.</translation> <translation>Fijar duración: 10 minutos</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Escala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Regla</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Medir propiedades de segmentos de la inmersión</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>escalar la inmersión al tamaño de pantalla</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>aire</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Cambio de emergencia a OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>comienzo</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>fin</translation> @@ -1880,72 +1915,72 @@ Por favor, bórralas antes.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Inmersión #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Profundidad máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Duración: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gas usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Lastre:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Calificación:</translation> </message> @@ -1958,7 +1993,7 @@ Por favor, bórralas antes.</translation> <translation>AIRE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Borrar este punto</translation> </message> @@ -1985,7 +2020,7 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Mueve el mapa y haz doble click para fijar la posición del buceo</translation> </message> </context> <context> @@ -2055,42 +2090,42 @@ Por favor, bórralas antes.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Servicio web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Conectando…</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Descarga finalizada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Error de descarga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Error de conexión:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>El identificador de usuario no es válido.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>No se puede analizar la respuesta.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Se ha completado la descarga correctamente.</translation> </message> @@ -2106,17 +2141,17 @@ Por favor, bórralas antes.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2159,7 @@ Por favor, bórralas antes.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Información</translation> </message> @@ -2132,12 +2167,12 @@ Por favor, bórralas antes.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2181,8 @@ Por favor, bórralas antes.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Descargar datos de ubicación</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2215,30 @@ Por favor, bórralas antes.</translation> <translation>Subir</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Tiempo de espera sobrepasado</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Transfiriendo datos ...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Pulsar aquí borrará este sistema de lastre.</translation> </message> @@ -2211,79 +2246,79 @@ Por favor, bórralas antes.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Año > Mes / Viaje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Duración Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Más corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Más larga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Profundidad (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>CAS (%1) Medio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2391,9 @@ Media</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2427,10 @@ Media</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>No se pudo leer «%s»</translation> </message> @@ -2406,8 +2441,8 @@ Media</translation> <translation>Falló al leer '%s'. Usa "Importar" para archivos CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>El máximo número de columnas que soporta importar CSV es %d</translation> </message> @@ -2684,23 +2719,23 @@ Media</translation> <translation>No se puede abrir la hoja de estilos (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>No encuentro el gas %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Demasiadas mezclas de gas</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,42 +2748,42 @@ basado en GFbajo = %.0f y GFalto = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Cambio de cota a %.*f %s en %d:%02d min - runtime %d:%02u con %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Permanecer a %.*f %s durante %d:%02d min - runtime %d:%02u en %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Cambio de gas a %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Consumo de gas: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> @@ -2886,7 +2921,7 @@ END:%d%s EADD:%d%s</source> <translation>%s PEA:%d%s -PNE:%d%s +PEN:%d%s EADD:%d%s</translation> </message> <message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index ef3236e8f..051d14fc8 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Siin klikkamine eemaldab selle ballooni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Ballooni ei saa eemaldada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone mida ei kasutata sellel sukeldumisel.</translation> </message> @@ -153,22 +153,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Mudel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Seadme ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Hüüdnimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Siin klikkamine eemaldab selle kompuutri.</translation> </message> @@ -176,12 +176,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>kuupjalga/min</translation> </message> @@ -189,87 +189,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Näita otsinguakent</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>laienda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>ahenda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>ahenda muud</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>kõrvalda sukeldumine/sukeldumised väljasõidust</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>loo uus väljasõit ülal</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>lisa sukeldumine/sukeldumised väljasõitu kohe eespool </translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>ühenda väljasõit väljasõiduga ülal</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>kustuta sukeldumine/sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>ekspordi UDDF kujul</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>nihuta ajad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Salvesta sukeldumised nimega</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Salvesta fail nimega</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF failid (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>ühenda valitud sukeldumised</translation> </message> @@ -325,12 +335,12 @@ <translation>30 jalga</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Draiveri asukoha viga</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Üks või enam peatust läheb selle operatsiooniga kaotsi, @@ -340,37 +350,37 @@ palun eemalda need esmalt.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>ÕHK</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Lõppsügavus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC seadepunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Loobu plaanist?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Oled plaanist loobumas.</translation> </message> @@ -378,17 +388,17 @@ palun eemalda need esmalt.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Sukeldumise planeerija punktid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Saadavad gaasid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>lisa sukeldumise andmdete punkt</translation> </message> @@ -396,67 +406,67 @@ palun eemalda need esmalt.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>kuupäev</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>asukoht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>Hapnikumürgistuse ühik (OTU)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -464,71 +474,95 @@ palun eemalda need esmalt.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Vigane vastus serverilt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Oodatava XML tag-i 'DiveDateReader' asemel on '%1'</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>XML tag-i 'DiveDates' ei leitud</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -854,22 +888,22 @@ palun eemalda need esmalt.</translation> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -976,7 +1010,7 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Impordi failid</translation> </message> @@ -1006,112 +1040,112 @@ palun eemalda need esmalt.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Välju</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Impordi &sukeldumiskompuutrist</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Impordi &GPS andmed Subsurface teenusest</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Toimeta seadmete nimesid</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Nummerda ümber</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>&Suum sisse/välja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>Statistika &aastate kaupa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Sukeldumiste list</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profiil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Kõik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Kasutusjuhend</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Maakera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&laneeri sukeldumine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Import CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Import CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Import Divelogs.de-st</translation> </message> @@ -1126,174 +1160,174 @@ palun eemalda need esmalt.</translation> <translation>Eelistused</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Lisa sukeldumine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Autogrupeerimine</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>CTRL+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>CTRL+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Eelmine kompuuter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Vasak</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Uus kompuuter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Parem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Vali sündmused</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Sisesta plaan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Subsurface kohta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Ava fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Enne sukeldumise planeerimist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Kasutusjuhend</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Ei leia Subsurface juhendit</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Soovid tehtud muudatused salvestada faili %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Soovid tehtud muudatused salvestada andmefaili?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Sulge käesolev toimetamine ja alles siis alusta järgmist.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF files (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1352,7 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Keel</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1427,12 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>meeter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>jalg</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1447,22 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>liiter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>kuupjalg</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1593,22 +1627,22 @@ palun eemalda need esmalt.</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Ava vaike logifail</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML failid (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1652,17 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>&Eelvaade</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>P&rindi</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>&Sulge</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1808,70 +1842,70 @@ palun eemalda need esmalt.</translation> <translation>Sea kestus: 10 minutit</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Mõõtkava</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Joonlaud</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Mõõda sukeldumise segmentide atribuute</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Skaleeri sukeldumine ekraani mõõtu</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Toimeta</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHE</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>õhk</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Üleminek avatud süsteemile</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> algus</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> lõpp</translation> @@ -1880,72 +1914,72 @@ palun eemalda need esmalt.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Sukeldumine #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Max sügavus: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Kestus: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Kasutatud gaas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Raskused:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Nähtavus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Hinne:</translation> </message> @@ -1958,7 +1992,7 @@ palun eemalda need esmalt.</translation> <translation>ÕHK</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Eemalda see punkt</translation> </message> @@ -2055,42 +2089,42 @@ palun eemalda need esmalt.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Veebiteenus</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Ühendab...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Viga ühendamisel:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Vale kasutaja ID!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Ei suuda vastust tuvastada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Allalaadimine õnnestus!</translation> </message> @@ -2106,17 +2140,17 @@ palun eemalda need esmalt.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2158,7 @@ palun eemalda need esmalt.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Info</translation> </message> @@ -2132,12 +2166,12 @@ palun eemalda need esmalt.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2180,8 @@ palun eemalda need esmalt.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Lae alla asukoha andmed</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,12 +2214,12 @@ palun eemalda need esmalt.</translation> <translation>Üleslaadimine</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2193,17 +2227,17 @@ palun eemalda need esmalt.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tüüp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Siin klikkamine kõrvaldab selle raskuste süsteemi</translation> </message> @@ -2211,79 +2245,79 @@ palun eemalda need esmalt.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Aasta > Kuu / väljasõit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Kestus kokku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Lühim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Pikim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Sügavus (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Miinimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2390,9 @@ Maksimum</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2426,10 @@ Maksimum</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>'%s' lugemine ebaõnnestus</translation> </message> @@ -2406,8 +2440,8 @@ Maksimum</translation> <translation>'%s' lugemine ebaõnnestus. Kasuta CSV failide importi.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV impordil on max toetatud veergude arv %d</translation> </message> @@ -2684,23 +2718,23 @@ Maksimum</translation> <translation>Ei suuda avada stiililehte (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Ei leia gaasi %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Liiga palju gaasisegusid</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,42 +2747,42 @@ põhineb väärtustel GFlow = %.0f ja GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Üleminek %.*f %s %d:%02d min jooksul - käitusaeg %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Mine üle %s gaasile </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gaasi tarbimine: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s of %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 29add83fd..f44c36fe9 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Poista säiliö.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Säiliötä ei voida poistaa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </message> @@ -153,22 +153,22 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Malli</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Laite ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Lempinimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Poista sukellustietokone.</translation> </message> @@ -176,12 +176,12 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>jalkaa/min</translation> </message> @@ -189,87 +189,97 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Näytä hakukenttä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>laajenna kaikki</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>supista kaikki</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>supista muut</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>erota sukellukset retkestä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>luo uusi retki yläpuolelle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>lisää sukellukset yläpuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>liitä retki yllä olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>poista sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>vie UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>muuta aikoja</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Tallenna sukellukset nimellä...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>yhdistä valitut sukellukset</translation> </message> @@ -325,12 +335,12 @@ poistaa valitun sukellustietokoneen?</translation> <translation>30 jalkaa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Tämä toimenpide hävittää yhden tai useamman pysähdyksistäsi, @@ -340,37 +350,37 @@ poista ensin pysähdykset.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Ilma</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CCR-asetuspiste</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Hylätäänkö suunnitelma?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Olet hylkäämässä suunnitelmasi.</translation> </message> @@ -378,17 +388,17 @@ poista ensin pysähdykset.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Sukellussuunnitelman etappipisteet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Mahdolliset kaasut</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>lisää sukellusetappi</translation> </message> @@ -396,67 +406,67 @@ poista ensin pysähdykset.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>päiväys</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>kohde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>Happikertymä</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -464,73 +474,98 @@ poista ensin pysähdykset.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Virheellinen vastaus palvelimelta</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Odotettu XML tägi on 'DiveDateReader', mutta saatiin '%1'</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Odotettua XML -tägiä 'DiveDates' ei löydy</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> + <translation>Virheellinen XML vastasu. Rivi %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> - <source>Uploading dive list...</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> + <source>Uploading dive list...</source> + <translation>Lähetetään sukelluslokia...</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Ladataan sukelluslokia...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>Ladataan %1 sukellusta...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Lataus päättynyt - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Lataus on korruptoitunut</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> + <translation>Pakattua tiedostoa ei voitu avata: +%1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Lähetys valmistui</translation> + </message> </context> <context> <name>DownloadFromDCWidget</name> @@ -854,22 +889,22 @@ poista ensin pysähdykset.</translation> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -976,7 +1011,7 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Liitä tiedosto</translation> </message> @@ -1006,112 +1041,112 @@ poista ensin pysähdykset.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Hae sukellustietokoneelta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>Muokkaa laitenimiä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>Uudellennumeroi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Venytä sukellusprofiilikuvaajaa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profiilikuvaaja</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Tiedot</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Kaikki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>Käyttöohje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Maapallo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Sukelluksen suunnittelu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Liitä CSV-tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Liitä CSV-tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Tuo Divelogs.de -sivustolta</translation> </message> @@ -1126,174 +1161,174 @@ poista ensin pysähdykset.</translation> <translation>Asetukset</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Lisää sukellus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Ryhmittele automaattisesti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Edellinen tietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Vasen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Seuraava tietokone</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Oikea</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Valitse tapahtumat</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Suunnittele</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Tietoja Subsurfacesta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus, ennen sukelluksen suunnittelua.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Käyttöohje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Subsurfacen käyttöohje ei löydy</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Muutokset hylätään, jos et tallenna niitä.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Viimeistele tämänhetkinen muokkaus, ennen kuin aloitat uuden.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Kieli</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>metri</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>jalka</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>litra</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>kuutiojalka</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>Celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>Fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,17 +1473,17 @@ poista ensin pysähdykset.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Järjestelmän oletus</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1525,7 +1560,7 @@ poista ensin pysähdykset.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>max ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1593,22 +1628,23 @@ poista ensin pysähdykset.</translation> <translation>GFhigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Vaaditaan uudelleenkäynnistys</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>Uuden kielen lataaminen vaatii Subsurfacen uudelleenkäynnistyksen +</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Avaa oletustiedosto</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1654,17 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>Esikatselu</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Tulosta</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Sulje</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1808,70 +1844,70 @@ poista ensin pysähdykset.</translation> <translation>Aseta kesto: 10 minuuttia</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Mittakaava</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Viivain</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Mittaa sukellusetappien ominaisuuksia</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Laajenna profiili tilan mukaan</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Muuta</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>ilma</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Vaihto avoimeen ilman kiertoon</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>alku</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>loppu</translation> @@ -1880,72 +1916,72 @@ poista ensin pysähdykset.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Sukellus #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Suurin syvyys: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Kesto: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Kaasu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Painot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Sukellusvanhin:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> @@ -1958,7 +1994,7 @@ poista ensin pysähdykset.</translation> <translation>Ilma</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Poista tämä etappi</translation> </message> @@ -1985,7 +2021,7 @@ poista ensin pysähdykset.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation> </message> </context> <context> @@ -2055,42 +2091,42 @@ poista ensin pysähdykset.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Verkkopalvelu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Yhdistetään...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Lataus valmistui</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Virhe latauksessa: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Yhteysvirhe:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Tuntematon käyttäjä!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Vastauksen jäsentäminen ei onnistu!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Lataus onnistui!</translation> </message> @@ -2106,17 +2142,17 @@ poista ensin pysähdykset.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2160,7 @@ poista ensin pysähdykset.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Tiedot</translation> </message> @@ -2132,12 +2168,12 @@ poista ensin pysähdykset.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2182,8 @@ poista ensin pysähdykset.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Lataa sijaintitieto</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2216,30 @@ poista ensin pysähdykset.</translation> <translation>Lähetä</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Toimenpide ei valmistunut ajoissa</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Tietoa siirretään...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tyyppi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Poista painojärjestelmä näpäyttämällä ikonia.</translation> </message> @@ -2211,79 +2247,79 @@ poista ensin pysähdykset.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Vuosi > Kuukausi / Retki</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Kesto Kokonais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Keskim.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Lyhin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Pisin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Dyvyys (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Alin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Suurin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Lämpö (%1) @@ -2356,9 +2392,9 @@ Keski</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2428,10 @@ Keski</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Tiedoston '%s' avaaminen epäonnistui</translation> </message> @@ -2406,8 +2442,8 @@ Keski</translation> <translation>Tiedoston '%s' lukeminen epäonnistui. Käytä Liitä -toimintoa CSV -tiedostoille</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation> </message> @@ -2684,23 +2720,23 @@ Keski</translation> <translation>Konversiotiedoston avaus epäonnistui (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Seosta %d/%d ei löydy</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Liian monta kaasuseosta</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,42 +2749,42 @@ perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Siirtymä %.*f %s:n syvyyteen ajassa %d:%02d - aika %d:%02u kaasulla %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - aika %d:%02u kaasulla %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Kaasun kulutus: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f %s (%s) </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 8256f0206..7faeb6403 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Cliquer ici retirera ce bloc.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Le bloc ne peut être retiré.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </message> @@ -153,22 +153,22 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modèle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Identifiant du périphérique</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Surnom</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Cliquer ici retirera cet ordinateur de plongée.</translation> </message> @@ -176,12 +176,12 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -189,87 +189,97 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Montrer la barre de recherche</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>tout déplier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>tout replier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>replier les autres</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>retirer plongée(s) du groupe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>créer un nouveau groupe au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>ajouter plongée(s) au groupe immédiatement au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>fusionner le groupe avec le groupe au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>fusionner le groupe avec le groupe au dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>supprimer plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Enregistrer sous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Exporter comme un fichier UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>décaler l'heure</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Enregistrer les plongées sous...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Fichiers UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>fusionner les plongées sélectionnées</translation> </message> @@ -325,12 +335,12 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Gestion des positions problématiques</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Un ou plusieurs paliers seront perdus avec ces opérations, @@ -340,37 +350,37 @@ Veuillez d'abord les supprimer.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Profondeur Finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gaz Utilisé</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>Recycleur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Annuler la planification ?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Vous allez annuler la planification.</translation> </message> @@ -378,17 +388,17 @@ Veuillez d'abord les supprimer.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Point planifiés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Gaz disponibles</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>Ajouter un point de donnée</translation> </message> @@ -396,67 +406,67 @@ Veuillez d'abord les supprimer.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>blk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>lieu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>SNCmax</translation> </message> @@ -464,73 +474,98 @@ Veuillez d'abord les supprimer.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Réponse invalide du serveur</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Le tag XML 'DiveDateReader' est attendu, '%1' a été lu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Le tag XML 'DiveDates' n'a pas été trouvé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> + <translation>Réponse XML mal formée. Ligne %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> - <source>Uploading dive list...</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> + <source>Uploading dive list...</source> + <translation>Téléchargement de la liste des plongées</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Téléchargement de la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>%1 plongées en cours de téléchargement</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Téléchargement terminé - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Téléchargement corrompu</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> + <translation>L'archive ne peut pas être ouverte: +%1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Téléchargement terminé</translation> + </message> </context> <context> <name>DownloadFromDCWidget</name> @@ -854,22 +889,22 @@ Veuillez d'abord les supprimer.</translation> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>O</translation> </message> @@ -976,7 +1011,7 @@ Veuillez d'abord les supprimer.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importer des fichiers</translation> </message> @@ -1006,112 +1041,112 @@ Veuillez d'abord les supprimer.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Quitter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importer depuis l'&ordinateur de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importer les données &GPS depuis le service Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Modifier le nom du périphérique</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Renuméroter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Changer de &zoom</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Statistiques annuelles</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Liste de plongées</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informations</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Tout</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>Manuel d'utilisation</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&lannification de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importer un fichier CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importer un fichier CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importer depuis divelogs.de</translation> </message> @@ -1126,174 +1161,174 @@ Veuillez d'abord les supprimer.</translation> <translation>Préférences</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Ajouter une plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Groupement automatique</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Ordinateur précédent</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Gauche</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Ordinateur suivant</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Droite</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Sélection des événements</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Saisir le plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>À propos de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Ouvrir un Fichier</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de démarrer une planification.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Manuel utilisateur</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Impossible de trouver le manuel de Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Enregistrement des changements ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Veuillez finir votre modification en cours avant d'en faire une autre.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Fichiers UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ Veuillez d'abord les supprimer.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Langue</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ Veuillez d'abord les supprimer.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>mètre</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>pied</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ Veuillez d'abord les supprimer.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>litre</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>pied cubique</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,12 +1473,12 @@ Veuillez d'abord les supprimer.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> @@ -1525,7 +1560,7 @@ Veuillez d'abord les supprimer.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>ppO₂ maximum</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1593,22 +1628,22 @@ Veuillez d'abord les supprimer.</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Redémarrage necessaire</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Ouvrir le fichier de plongée par défaut</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1808,70 +1843,70 @@ Veuillez d'abord les supprimer.</translation> <translation>Réglez la durée : 10 minutes</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Échelle</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Règle</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Mesure des propriétés d'une partie de la plongée</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Ajuster la plongée à la taille de l'écran</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Editer</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Passer en CO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> début</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> fin</translation> @@ -1880,72 +1915,72 @@ Veuillez d'abord les supprimer.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Plongée #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Profondeur max: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Durée: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gaz utilisé:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>Consommation d'air:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>SNC Max.:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Poids:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Chef de palanquée:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Binôme:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Combinaison:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Visi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Évaluation:</translation> </message> @@ -1958,7 +1993,7 @@ Veuillez d'abord les supprimer.</translation> <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Supprimer ce point</translation> </message> @@ -1985,7 +2020,7 @@ Veuillez d'abord les supprimer.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Déplacez la carte et double cliquez pour définir le lieu de la plongée</translation> </message> </context> <context> @@ -2055,42 +2090,42 @@ Veuillez d'abord les supprimer.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Serveur</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Connexion en cours...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Téléchargement terminé</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Erreur de téléchargement: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Erreur de connexion : </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Identifiant utilisateur incorrect.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Impossible de lire la réponse</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Téléchargement réussi</translation> </message> @@ -2106,17 +2141,17 @@ Veuillez d'abord les supprimer.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2159,7 @@ Veuillez d'abord les supprimer.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Information</translation> </message> @@ -2132,12 +2167,12 @@ Veuillez d'abord les supprimer.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2181,8 @@ Veuillez d'abord les supprimer.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Télécharge les informations de position</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2215,30 @@ Veuillez d'abord les supprimer.</translation> <translation>Envoyer</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Transfert des données en cours</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Cliquer ici retirera ce système de poids.</translation> </message> @@ -2211,79 +2246,79 @@ Veuillez d'abord les supprimer.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Année > Mois / Groupe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Durée Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Plus courte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Plus longue</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Pronfondeur (%&) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2391,9 @@ Moyenne</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2427,10 @@ Moyenne</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Impossible de la lecture « %s »</translation> </message> @@ -2406,8 +2441,8 @@ Moyenne</translation> <translation>Impossible de lire '%s'. Veuillez utiliser l'importation de fichier CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Le nombre maximal de colonnes supporté pour les importations de fichiers CSV est %d.</translation> </message> @@ -2684,23 +2719,23 @@ Moyenne</translation> <translation>Impossible d'ouvrir la feuille de style (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Impossible de trouver le gaz %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Trop de gaz différents</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,42 +2748,42 @@ basé sur un GFlow = %.0f et un GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Transition vers %.*f %s en %d:%02d min - temps %d:%02u sur %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Rester à %.*f %s pour %d:%02d min - temps %d:%02u sur %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Changer pour du gaz %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Consommation de gaz : </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 65bbcbfd0..e29f19328 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>דגם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>מזהה התקן</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>כינוי</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>ליטר לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>רגל מעוקב לדקה</translation> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>הצג חיפוש</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>הצג הכל</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>הסתר הכל</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>שמור קובץ בשם</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>אחד צלילות נבחרות</translation> </message> @@ -324,12 +334,12 @@ <translation>30 רגל</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>עצירה אחת או יותר יאבדו בפעולה זו @@ -339,37 +349,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>אוויר</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>עומק מירבי</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>אוויר שנוצל</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>למחוק תוכנית?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation> </message> @@ -377,17 +387,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -395,67 +405,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation type="unfinished"/> </message> @@ -463,71 +473,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -853,22 +887,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>מז</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation type="unfinished"/> </message> @@ -975,7 +1009,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>ייבא קבצים</translation> </message> @@ -1005,112 +1039,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1125,176 +1159,176 @@ Please, remove them first.</source> <translation>העדפות</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>הוסף צלילה</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>קבץ אוטומטי</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> - <translation type="unfinished"/> + <translation>שמאל</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> - <translation type="unfinished"/> + <translation>ימין</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>בחירת אירועים</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>הכנסת תכנית</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>אודות Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>פתך קובץ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>קובץ המדריך למשתמש לא נמצא</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>האם ברצונכם לשמור שינויים בקובץ %1 ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>האם לשמור שינויים בקובץ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>לשמור שינויים?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>שמור קובץ בשם</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> + <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> </context> <context> @@ -1592,24 +1626,24 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> + <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> </context> <context> @@ -1678,12 +1712,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="23"/> <source>Print options</source> - <translation type="unfinished"/> + <translation>אפשרויות הדפסה</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="41"/> <source>Print only selected dives</source> - <translation type="unfinished"/> + <translation>הדפס רק צלילות נבחרות</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="60"/> @@ -1693,7 +1727,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="86"/> <source>Print type</source> - <translation type="unfinished"/> + <translation>סוג הדפסה</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="116"/> @@ -1708,17 +1742,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> <source>Table print</source> - <translation type="unfinished"/> + <translation>הדפס טבלא</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="162"/> <source>Ordering</source> - <translation type="unfinished"/> + <translation>סדר</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="180"/> <source>Profile on top</source> - <translation type="unfinished"/> + <translation>פרופיל למעלה</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="202"/> @@ -1807,70 +1841,70 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>לחץ הליום</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>אוויר</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>להתחיל</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>סוף</translation> @@ -1879,72 +1913,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1957,7 +1991,7 @@ Please, remove them first.</source> <translation>אוויר</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2054,42 +2088,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation type="unfinished"/> </message> @@ -2105,17 +2139,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation type="unfinished"/> </message> @@ -2123,7 +2157,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2131,12 +2165,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>קילוגרם</translation> </message> @@ -2145,7 +2179,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2179,12 +2213,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2192,17 +2226,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>סוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2210,70 +2244,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2345,9 +2379,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2381,10 +2415,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation type="unfinished"/> </message> @@ -2395,8 +2429,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2668,23 +2702,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2693,37 +2727,37 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 131d1b87c..11cb24fb7 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Naziv uređaja</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation type="unfinished"/> </message> @@ -324,12 +334,12 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation type="unfinished"/> @@ -338,37 +348,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Zrak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -376,17 +386,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -394,67 +404,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -462,71 +472,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -852,22 +886,22 @@ Please, remove them first.</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -974,7 +1008,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation type="unfinished"/> </message> @@ -1004,112 +1038,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informacije</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1124,174 +1158,174 @@ Please, remove them first.</source> <translation>Postavke</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Prethodno računalo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Sljedeće računalo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Odaberi događaje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Unesi plan urona</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>O programu Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Otvori datoteku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Korisnički priručnik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Spremi promjene?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1591,22 +1625,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1806,70 +1840,70 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Uredi</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>zrak</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Neplanirani prelazak na OC sustav</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -1878,72 +1912,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1956,7 +1990,7 @@ Please, remove them first.</source> <translation>Zrak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2053,42 +2087,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Web servis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Spajanje...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Greška u komunikaciji: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Neispravna korisnička oznaka</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Ne mogu obraditi odziv</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Preuzimanje uspješno!</translation> </message> @@ -2104,17 +2138,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2122,7 +2156,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2130,12 +2164,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2144,7 +2178,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2178,12 +2212,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2191,17 +2225,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Vrsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2209,70 +2243,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2344,9 +2378,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2380,10 +2414,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Nije uspjelo čitanje '%s'</translation> </message> @@ -2394,8 +2428,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2672,23 +2706,23 @@ Maximum</source> <translation>Ne mogu otvoriti stylesheet (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Ne mogu naći plin %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Previše mješavina plinova</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2701,42 +2735,42 @@ temeljen na GFlow = %.0f i GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Prelazak na %.*f %s u %d:%02d min - ukupno vrijeme %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Stanka na %.*f %s u trajanju %d:%02d min - Ukupno vrijeme %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Prebaci plin na %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Potrošnja plina: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 9f91cb22f..f57f82c0f 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>ID Perangkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Nama Panggilan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>I/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Munculkan Kotak Pencari</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>Tampilkan semua</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>Sembunyikan semua</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Simpan Berkas sebagai</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>Gabungkan selam berikut</translation> </message> @@ -324,12 +334,12 @@ <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Kesalahan posisi Handler</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Satu atau lebih dari Pemberhentianmu akan hilang melalui pengoperasian ini, Coba, lepas terlebih dahulu</translation> @@ -338,37 +348,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>UDARA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Kedalaman akhir</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gas terpaikai</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>Titik CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Abaikan Rencana</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Kamu hendak mengabaikan Rencana</translation> </message> @@ -376,17 +386,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Titik-titik Rencana Selam</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -394,67 +404,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -462,71 +472,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -852,22 +886,22 @@ Please, remove them first.</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>U</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>T</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>B</translation> </message> @@ -974,7 +1008,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Impor Berkas</translation> </message> @@ -1004,112 +1038,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1124,174 +1158,174 @@ Please, remove them first.</source> <translation>Preferensi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Tambah Selam</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Grup Otomatis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Cltrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>DC Sebelumnya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Kiri</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>DC Selanjunya</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Kanan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Pilih Aktifitas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Masukkan Rencana</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Tentang Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Buka Berkas</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Panduan Subsurface tak dapat ditemukan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Anda ingin menyimpan perubahan yang sudah dilakukan pada Berkas %1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Anda ingin menyimpan perubahan yang sudah dilakukan pada datafile?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Simpan perubahan?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Simpan Berkas sebagai</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> @@ -1591,22 +1625,22 @@ Please, remove them first.</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Buka Berkas Log Acuan</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> @@ -1806,70 +1840,70 @@ Please, remove them first.</source> <translation>Set Durasi: 10 Menit</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Skala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Penggaris</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>udara</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Bailing out untuk OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Mulai</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>Akhir</translation> @@ -1878,72 +1912,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Selam #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Kedalaman Maks: 1% 2%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Durasi: %1 menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1956,7 +1990,7 @@ Please, remove them first.</source> <translation>UDARA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2053,42 +2087,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Kesalahan Koneksi:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>identifikasi pengguna tidak cocok!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Respon gagal di telaah!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Unduh Sukses!</translation> </message> @@ -2104,17 +2138,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2122,7 +2156,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Informasi</translation> </message> @@ -2130,12 +2164,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kgkg</translation> </message> @@ -2144,7 +2178,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2178,12 +2212,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2191,17 +2225,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tipe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2209,77 +2243,77 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Total Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Terpendek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Terjauh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Dalam (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maksimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2352,9 +2386,9 @@ Rata-rata</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2388,10 +2422,10 @@ Rata-rata</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Gagal baca '%s'</translation> </message> @@ -2402,8 +2436,8 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2675,23 +2709,23 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2700,37 +2734,37 @@ based on GFlow = %.0f and GFhigh = %.0f <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 9bdf83ca3..9e86af4b5 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Facendo click qui si rimuove la bombola.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>La bombola non può essere rimossa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Questo gas è in uso. Solo le bombole che non sono usate nell'immersione possono essere rimosse.</translation> </message> @@ -153,22 +153,22 @@ il computer seleizonato?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modello</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>ID della periferica</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Facendo click qui si rimuove questo computer.</translation> </message> @@ -176,12 +176,12 @@ il computer seleizonato?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>piedi cubi/min</translation> </message> @@ -189,87 +189,97 @@ il computer seleizonato?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Mostra la finestra di ricerca</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>espandi tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>collassa tutte le voci</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>rimuovi l'immersione(i) dal viaggio</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>crea un nuovo viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>aggiungi immersione(i) immediatamente sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>unisci il viaggio con il viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>unisci il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>cancella immersione(i)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Salva come</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Esporta come UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Salva immersioni come ...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Salva come</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>File UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>unisci le immersioni selezionate</translation> </message> @@ -325,12 +335,12 @@ il computer seleizonato?</translation> <translation>30 piedi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Gestore dell'errore di posizione</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Una o più soste verranno perse con questa operazione, @@ -340,37 +350,37 @@ Per favore, rimuovile prima.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>ARIA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Profondità finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gas usato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Elimino il piano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Stai cancellando il piano</translation> </message> @@ -378,17 +388,17 @@ Per favore, rimuovile prima.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Punti del Dive Planner</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Miscele disponibili</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -396,67 +406,67 @@ Per favore, rimuovile prima.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>max CNS</translation> </message> @@ -464,71 +474,95 @@ Per favore, rimuovile prima.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -854,22 +888,22 @@ Per favore, rimuovile prima.</translation> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -976,7 +1010,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importa files</translation> </message> @@ -1006,112 +1040,112 @@ Per favore, rimuovile prima.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Esci</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importa &dal computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importa dati &GPS del servizio Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Modifica il nome della periferica</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Rinumera</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Statistiche Annuali</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Lista immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profilo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informazioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Manuale Utente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Pianifica immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importa CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importa CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importa da Divelogs.de</translation> </message> @@ -1126,174 +1160,174 @@ Per favore, rimuovile prima.</translation> <translation>Preferenze</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Aggiungi immersione</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Raggruppamento Automatico</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>DC precedente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Sinistra</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>DC successivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Destra</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Seleziona eventi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Piano in ingresso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Informazioni su Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Apri File</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Manuale Utente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Manuale di Subsurface non trovato</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Vuoi salvare le modifiche fatte nel file %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Vuoi salvare le modifiche fatte nel datafile?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Salvare le modifiche?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Le modifiche saranno perse se tu non le salvi.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Salva come</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>File UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1593,22 +1627,22 @@ Per favore, rimuovile prima.</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Apri il log di default</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1808,70 +1842,70 @@ Per favore, rimuovile prima.</translation> <translation>Setta la durata: 10 minuti</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Scala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Righello</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Riscala l'immersione per l'ampiezza dello schermo</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Modifica</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>aria</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN1%</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Bailing out in circuito aperto</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>inizio</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>fine</translation> @@ -1880,72 +1914,72 @@ Per favore, rimuovile prima.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Immersione #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Massima profondità: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Miscela usata:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Pesi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Note:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> @@ -1958,7 +1992,7 @@ Per favore, rimuovile prima.</translation> <translation>ARIA</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Rimuovi questo punto</translation> </message> @@ -2055,42 +2089,42 @@ Per favore, rimuovile prima.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>In connessione...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Errore di connessione:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Identificatore dell'utente non valido!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Non posso analizzare la risposta!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Download effettuato!</translation> </message> @@ -2106,17 +2140,17 @@ Per favore, rimuovile prima.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2158,7 @@ Per favore, rimuovile prima.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Informazione</translation> </message> @@ -2132,12 +2166,12 @@ Per favore, rimuovile prima.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2180,8 @@ Per favore, rimuovile prima.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Scarica i dati dei luoghi</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,12 +2214,12 @@ Per favore, rimuovile prima.</translation> <translation>Invia</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2193,17 +2227,17 @@ Per favore, rimuovile prima.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Facendo click qui si rimuove il sistema di pesi.</translation> </message> @@ -2211,79 +2245,79 @@ Per favore, rimuovile prima.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Anno > Mese / Viaggio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Durata Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Più corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Più lunga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Profondità (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2390,9 @@ Media</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2426,10 @@ Media</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Impossibile leggere '%s'</translation> </message> @@ -2406,8 +2440,8 @@ Media</translation> <translation>Errore di lettura '%s'. Usa importa per i file CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation> </message> @@ -2685,23 +2719,23 @@ Media</translation> <translation>Non posso aprire il foglio di calcolo (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Non trovo il gas %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Troppe miscele gas</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2714,42 +2748,42 @@ basato su GFlow = %.0f e GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Transizione a %.*f %s in %d:%02d min - tempo %d:%02u su %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Fermati a %.*f %s per %d:%02d min - tempo trascorso %d:%02u su %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Cambiare gas a %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Consumo gas: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s di %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 2e5fcad43..5f50ebd68 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -87,7 +87,7 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>WorkPress</source> - <translation>Makstrykk</translation> + <translation>Trykk</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Klikk her for å fjerne denne flaska.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Enhets-ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Navn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klikk her for å fjerne denne computeren.</translation> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>ft³/min</translation> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Vis søkeboks</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>vis alle turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>slå sammen alle turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>slå sammen andre turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>fjern dykk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>legg til ny tur over denne</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>legg dykk til turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>slå sammen tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>slå sammen tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>slett dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>merk dykk som skjult</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>lagre som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>eksporter som UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>forskyvning av tidspunkter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>last opp til divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Lagre dykk som...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF-filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>slå sammen valgte dykk</translation> </message> @@ -324,12 +334,12 @@ <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Handler Position-feil</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>En eller flere av stoppene dine vil bli tapt hvis du fortsetter. @@ -339,37 +349,37 @@ Fjern dem før du gjør dette.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> - <translation>Brukt gass</translation> + <translation>Gass</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Forkaste planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Du er i ferd med å forkaste planen.</translation> </message> @@ -377,17 +387,17 @@ Fjern dem før du gjør dette.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Punkter i dykkeplan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Tilgjengelige gasser</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>legg til datapunkt</translation> </message> @@ -395,67 +405,67 @@ Fjern dem før du gjør dette.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>sted</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maks CNS</translation> </message> @@ -463,72 +473,97 @@ Fjern dem før du gjør dette.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Ugyldig svar fra tjener</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Forventet XML-tag 'DiveDateReader', men fikk '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Fant ikke XML-tag 'DiveDates' som forventet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> + <translation>Feil formattert XML-svar. Linje %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>Klarte ikke å lage DLD-fil</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Ferdig</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> - <translation type="unfinished"/> + <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>Arkivet kunne ikke åpnes: +%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>Opplasting feilet</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>Innlogging feilet</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>Kan ikke lese svar</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Feil: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Opplasting er ferdig</translation> </message> </context> <context> @@ -853,22 +888,22 @@ Fjern dem før du gjør dette.</translation> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>V</translation> </message> @@ -975,7 +1010,7 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importer filer</translation> </message> @@ -1005,112 +1040,112 @@ Fjern dem før du gjør dette.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importer fra &dykkecomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importer &GPS-data fra Subsurface-tjenesten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>Rediger &enhetsnavn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>Nummere&r på nytt</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Bytt &zoom</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>Årlig statistikk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>Bruker&manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globus</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&lanlegg dykk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importer CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importer CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importer fra divelogs.de</translation> </message> @@ -1125,174 +1160,174 @@ Fjern dem før du gjør dette.</translation> <translation>Valg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Nytt dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Forrige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Venstre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Neste DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Høyre</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Velg hendelser</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Legg inn plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Lagre eller avbryt redigeringen før du lukker fila.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Lagre eller avbryt redigeringa før du planlegger et dykk.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Brukermanual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Finner ikke manualen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Vil du lagre endringene i %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Vil du lagre endringene?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Avslutt redigeringa før du redigerer et nytt.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Lagre som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF-filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> @@ -1317,7 +1352,7 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Språk</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1352,7 +1387,7 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/preferences.ui" line="197"/> <source>Display Invalid</source> - <translation>Vis ugyldige</translation> + <translation>Vis skjulte</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="214"/> @@ -1392,12 +1427,12 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>meter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>fot</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1412,22 +1447,22 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>liter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>ft³</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1437,17 +1472,17 @@ Fjern dem før du gjør dette.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Standard for system</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1524,7 +1559,7 @@ Fjern dem før du gjør dette.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>maks ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1592,22 +1627,22 @@ Fjern dem før du gjør dette.</translation> <translation>GF høy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Programmet må startes på nytt</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>For å bytte språk må du starte Subsurface på nytt.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Åpne standardlogg</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> @@ -1617,17 +1652,17 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>Forhåndsvisning</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Skriv ut</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Lukk</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1807,70 +1842,70 @@ Fjern dem før du gjør dette.</translation> <translation>Varighet: 10 minutter</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Målestokk</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Linjal</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Mål egenskaper ved dykk</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Skaler dykket til skjermstørrelsen</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Rediger</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>pO₂</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Bytter til OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> start</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> slutt</translation> @@ -1879,72 +1914,72 @@ Fjern dem før du gjør dette.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Dykk nr. %1- %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Varighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gass brukt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Mac. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Vekter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notater:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -1957,7 +1992,7 @@ Fjern dem før du gjør dette.</translation> <translation>Luft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Fjern dette punktet</translation> </message> @@ -1984,7 +2019,7 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation> </message> </context> <context> @@ -2054,42 +2089,42 @@ Fjern dem før du gjør dette.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Nettjeneste</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Kobler til...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Nedlasting er ferdig</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Feil ved nedlasting: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Feil med forbindelse</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Ugyldig bruker-ID!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Kan ikke lese svar!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Ferdig å laste ned</translation> </message> @@ -2105,17 +2140,17 @@ Fjern dem før du gjør dette.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2123,7 +2158,7 @@ Fjern dem før du gjør dette.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Informasjon</translation> </message> @@ -2131,12 +2166,12 @@ Fjern dem før du gjør dette.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2145,8 +2180,8 @@ Fjern dem før du gjør dette.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Last ned stedsdata</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2179,30 +2214,30 @@ Fjern dem før du gjør dette.</translation> <translation>Last opp</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Handlingen fikk tidsavbrudd</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Overfører data...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Klikk her for å fjerne dette vektsystemet</translation> </message> @@ -2210,79 +2245,79 @@ Fjern dem før du gjør dette.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>År > Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Varighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Lengst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2355,9 +2390,9 @@ Snitt</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2391,10 +2426,10 @@ Snitt</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> @@ -2405,8 +2440,8 @@ Snitt</translation> <translation>Klarte ikke å lese '%s'. Bruk CSV-importen isteden.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maks antall kolonner i CSV-importen er %d</translation> </message> @@ -2683,23 +2718,23 @@ Snitt</translation> <translation>Kan ikke åpne stilark (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Finner ikke gassen %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>For mange gassmikser</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2712,42 +2747,42 @@ basert på GF lav = %.0f og GF høy = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Overgang til %.*f %s i %d:%02d min - kjøretid %d:%02u på %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Bli ved %.*f %s i %d:%02d min - kjøretid %d:%02u på %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Bytt gass til %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gasskonsum: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s på %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 5491055de..5a3c7ba2f 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik hier om de fles te verwijderen.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Fles kan niet verwijderd worden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden.</translation> </message> @@ -153,22 +153,22 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Toestel ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Apparaatnaam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klik hier om deze duikcomputer te verwijderen.</translation> </message> @@ -176,12 +176,12 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -189,87 +189,97 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Zoekvak Tonen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>alles uitklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>alles inklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>andere samenklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>duik(en) uit trip verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>nieuwe duik aanmaken hierboven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>duik(en) toevoegen aan de trip hierboven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>trip samenvoegen met trip hierboven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>trip samenvoegen met trip hieronder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>duik(en) verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>markeer duik(en) als ongeldig</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>bewaren Als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Als UDDF exporteren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>tijdstippen verschuiven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>duik(en) laden op divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Duiken Bewaren Als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Bestand Bewaren als</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF bestanden (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>geselecteerde duiken samenvoegen</translation> </message> @@ -325,12 +335,12 @@ duikcomputer wilt verwijderen?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Geleider Positie Fout</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Een of meer stops zullen verloren gaan. @@ -340,37 +350,37 @@ Verwijder deze eerst.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Verbruikt Gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Plan verwijderen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>U staat op het punt het plan te verwijderen</translation> </message> @@ -378,17 +388,17 @@ Verwijder deze eerst.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Duikplanner punten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Beschikbare Gassen</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>duik punt toevoegen</translation> </message> @@ -396,67 +406,67 @@ Verwijder deze eerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>duikpak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>locatie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -464,72 +474,97 @@ Verwijder deze eerst.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Ongeldig antwoord van de server</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>XML etiket 'DiveDateReader' werd verwacht, maar kreeg '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Verwacht XML etket 'DiveDates' werd niet gevonden</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> + <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>Het DLD bestand kan niet aangemaakt worden</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Klaar</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> - <translation type="unfinished"/> + <translation>Duiklijst wordt opgeladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Duiklijst wordt geladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>%1 duiken worden geladen...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Download klaar - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Beschadigde download</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>Het archief kon niet geopend worden: +%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>Opladen mislukt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Opladen gelukt</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>Login mislukt</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>Kan antwoord niet correct ontleden</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Fout: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Opladen klaar</translation> </message> </context> <context> @@ -854,22 +889,22 @@ Verwijder deze eerst.</translation> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>Z</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -884,7 +919,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="174"/> <source>&File</source> - <translation>Bestand (&F)</translation> + <translation>Bestand</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="189"/> @@ -894,7 +929,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="200"/> <source>&View</source> - <translation>Toon (&V)</translation> + <translation>Toon</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="221"/> @@ -939,7 +974,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="267"/> <source>&Save</source> - <translation>Bewaar (&S)</translation> + <translation>Bewaar</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="270"/> @@ -976,7 +1011,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Bestanden importeren</translation> </message> @@ -998,7 +1033,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="319"/> <source>&Print</source> - <translation>Afdrukken (&P)</translation> + <translation>Afdrukken</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="330"/> @@ -1006,112 +1041,112 @@ Verwijder deze eerst.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> - <translation>Afsluiten (&Q)</translation> + <translation>Afsluiten</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importeren uit &duikcomputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>&GPS gegevens importeren van Subsurface Service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> - <translation>Namen toestellen wijzigen (&E)</translation> + <translation>Namen toestellen wijzigen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> - <translation>Hernummeren (&R)</translation> + <translation>Hernummeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>&Zoom in-/uitschakelen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> - <translation>Jaarlijkse Statistieken (&Y)</translation> + <translation>Jaarlijkse Statistieken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profiel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informatie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> - <translation>Handleiding (&M)</translation> + <translation>Handleiding</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Wereldbol</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Duik P&lannen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>CSV importeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>CS&V importeren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importeren van Divelogs.de</translation> </message> @@ -1126,174 +1161,174 @@ Verwijder deze eerst.</translation> <translation>Instellingen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Duik Toevoegen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Automatisch Groeperen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Vorige DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Links</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Volgende DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Rechts</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>gebeurtenissen selecteren</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Voer plan in</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Over Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik plant.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> - <translation>Gebruikershandleiding</translation> + <translation>Handleiding</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>De handleiding kan niet gevonden worden</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Wilt u de wijzigingen bijhouden in het bestand?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Bestand Bewaren als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF bestanden (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Taal</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>meter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>voet</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>liter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>cu ft</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,17 +1473,17 @@ Verwijder deze eerst.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Systeem Standaardinstelling</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1525,7 +1560,7 @@ Verwijder deze eerst.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>max ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1593,22 +1628,22 @@ Verwijder deze eerst.</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Herstarten noodzakelijk</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>Om een nieuwe taal te laden dient u Subsurface te herstarten.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Standaard Logboek Openen</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1653,17 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>Voorbeeldweergave</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Afd&rukken</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Sluiten</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1808,70 +1843,70 @@ Verwijder deze eerst.</translation> <translation>Duur instellen: 10 minuten</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Schaal</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Meetlat</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Eigenschappen van duiksegmenten berekenen</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Duik aan schermgrootte aanpassen</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Bewerken</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>lucht</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Schakel om naar OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> eind</translation> @@ -1880,72 +1915,72 @@ Verwijder deze eerst.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Duik #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Max diepte: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Duur: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Verbruikt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Gewichten:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Nota's:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Zichtbaarheid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> @@ -1958,7 +1993,7 @@ Verwijder deze eerst.</translation> <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Dit punt verwijderen</translation> </message> @@ -1985,7 +2020,7 @@ Verwijder deze eerst.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Verplaats de kaart en dubbelklikk om de duiklocatie te selecteren</translation> </message> </context> <context> @@ -2055,42 +2090,42 @@ Verwijder deze eerst.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Verbinding wordt opgezet.</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Download klaar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Download fout: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Verbindingsfout:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Ongeldige gebruikersidentificatie</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Kan antwoord niet parsen!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Laden succesvol voltooid!</translation> </message> @@ -2106,17 +2141,17 @@ Verwijder deze eerst.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2159,7 @@ Verwijder deze eerst.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Informatie</translation> </message> @@ -2132,12 +2167,12 @@ Verwijder deze eerst.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2181,8 @@ Verwijder deze eerst.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Locatie gegevens downloaden</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2215,30 @@ Verwijder deze eerst.</translation> <translation>Uploaden</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Operatie duurt te lang</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Gegevens worden overgebracht...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Hier klikken om het gewichtssysteem te verwijderen</translation> </message> @@ -2211,79 +2246,79 @@ Verwijder deze eerst.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Jaar > Maand / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Duur Totaal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Kortste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Langste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Diepte (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>Gasverbruik (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2391,9 @@ Maximum</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2427,10 @@ Maximum</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Fout bij lezen van '%s'</translation> </message> @@ -2406,8 +2441,8 @@ Maximum</translation> <translation>'%s' lezen is mislukt. Gebruik Importeren voor CSV bestanden.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation> </message> @@ -2684,23 +2719,23 @@ Maximum</translation> <translation>Kan stylesheet (%s)/%s niet openen</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Kan gasmengsel %d/%d niet vinden</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Teveel gasmengsels</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,42 +2748,42 @@ Gebaseerd op GFlow = %.0f en GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Ga naar %.*f %s over %d:%02d min - looptijd %d:%02u op %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Blijft op %.*f %s gedurende %d:%02d min - looptijd %d:%02u op %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Gaswissel naar %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gasverbruik: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>EAN</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 21d80588f..05afb36a4 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -87,17 +87,17 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>WorkPress</source> - <translation>Ciśnienie robocze</translation> + <translation>Ciś. robocze</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>StartPress</source> - <translation>Ciśnienie początkowe</translation> + <translation>Ciś. początkowe</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>EndPress</source> - <translation>Ciśnienie końcowe</translation> + <translation>Ciś. końcowe</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknięcie tu usunie butlę z listy.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Butla nie może być usunięta.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ten gaz jest używany. Można usuwać tylko butle, których nie używasz.</translation> </message> @@ -153,22 +153,22 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>ID urządzenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Nazwa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Kliknięcie tu usunie komputer nurkowy.</translation> </message> @@ -176,12 +176,12 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -189,87 +189,97 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Pokaż okno wyszukiwania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>rozwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>zwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>zwiń pozostałe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>dodaj nurkowanie(a) do grupy powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>połącz grupę z grupą powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>usuń nurkowanie(a)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>oznacz nurkowanie(a) jak niepoprawne</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>zapisz jako</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>eksportuj jako plik UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>zmień czas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>Wyślij nurkowanie(a) do divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Zapisz nurkowania jako...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Pliki UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>połącz wybrane nurkowania</translation> </message> @@ -325,12 +335,12 @@ wybrany komputer nurkowy?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Niedozwolone położenie punktu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>W wyniku tej operacji jeden lub więcej puntów znajdzie się @@ -340,37 +350,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>POWIETRZE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Głębokość końcowa </translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Porzucić plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Masz zamiar porzucić plan</translation> </message> @@ -378,17 +388,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Plan nurkowy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Dostępne gazy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>dodaj punkt do profilu</translation> </message> @@ -396,67 +406,67 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>butla</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>miejsce</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -464,72 +474,97 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Niepoprawna odpowiedź z serwera</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Oczekiwano tagu XML 'DiveDateReader', zamiast tego odczytano '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Oczekiwany tag XML 'DiveDates' nie został znaleziony</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> + <translation>Uszkodzona odpowiedź XML. Linia %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>Nie można utworzyć pliku DLD</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Zakończ</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> - <translation type="unfinished"/> + <translation>Wysyłanie listy nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Pobieranie listy nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>Pobieranie %1 nurkowań...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Zakończono pobieranie - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Pobrano uskodzone dane</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>Archiwum nie mogło zostać otworzone: +%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>Wysyłanie nieudane</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Wysyłanie zakończone sukcesem</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>Błąd logowania</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>Nie można przetworzyć odpowiedzi</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Błąd: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Wysyłanie zakończone</translation> </message> </context> <context> @@ -604,7 +639,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/globe.cpp" line="104"/> <source>Edit Selected Dive Locations</source> - <translation type="unfinished"/> + <translation>Wskaż miejsce zaznaczonych nurkowań</translation> </message> </context> <context> @@ -613,7 +648,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <location filename="../qt-ui/maintab.ui" line="18"/> <location filename="../qt-ui/maintab.cpp" line="413"/> <source>Dive Notes</source> - <translation>Notatki</translation> + <translation>Opis nurkowania</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> @@ -664,7 +699,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/maintab.ui" line="199"/> <source>Visibility</source> - <translation>Widoczność</translation> + <translation>Widzialność</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="215"/> @@ -675,7 +710,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <location filename="../qt-ui/maintab.ui" line="208"/> <location filename="../qt-ui/maintab.cpp" line="438"/> <source>Notes</source> - <translation>Notatki</translation> + <translation>Opis</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="262"/> @@ -705,7 +740,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/maintab.ui" line="444"/> <source>Gas Consumed</source> - <translation>Zużyty gaz</translation> + <translation>Zużycie gazu</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="463"/> @@ -827,17 +862,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/maintab.cpp" line="231"/> <source>This trip is being edited.</source> - <translation type="unfinished"/> + <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="237"/> <source>Multiple dives are being edited.</source> - <translation type="unfinished"/> + <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="239"/> <source>This dive is being edited.</source> - <translation type="unfinished"/> + <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="454"/> @@ -854,22 +889,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -904,7 +939,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="228"/> <source>&Import</source> - <translation>Importuj pliki</translation> + <translation>Import</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="245"/> @@ -976,7 +1011,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importuj pliki</translation> </message> @@ -1006,112 +1041,112 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>Wyjdź</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importuj z komputera nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> - <translation>Import dane GPS z Subsurface Service</translation> + <translation>Importuj dane GPS z Subsurface Service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>Edycja nazw komputerów nurkowych</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Zmiana skali</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Lista nurkowań</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Informacje</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Wszystkie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>Instrukcja obsługi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> - <translation>Globus</translation> + <translation>Mapa</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Zaplanuj nurkowanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importuj plik CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importuj plik CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importuj z Divelogs.de</translation> </message> @@ -1126,174 +1161,174 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Ustawienia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Dodaj nurkowanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Automatycznie grupuj</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Poprzedni komputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> - <translation>Lewo</translation> + <translation>W lewo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Następny komputer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> - <translation>Prawo</translation> + <translation>W prawo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Wybór zdarzeń</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Wprowadź plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> - <translation type="unfinished"/> + <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> - <translation type="unfinished"/> + <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed planowaniem nowego.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> - <translation type="unfinished"/> + <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>instrukcja obsługi</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Nie można znaleźć dokumentacji Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Czy chcesz zapisać wprowadzone zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> - <translation type="unfinished"/> + <translation>Dokończ edycję tego nurkowania przed rozpoczęciem kolejnej. </translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> - <translation type="unfinished"/> + <translation>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Pliki UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Język</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>metry</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>stopy</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>litry</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>stopy sześcienne (cu ft)</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>stopnie Celsjusza</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>stopnie Fahrenheita</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,17 +1473,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Domyślne ustawienia systemu</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1525,7 +1560,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>max ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1593,22 +1628,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Wymagane ponowne uruchomienie</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Otwórz domyślny plik</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1653,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>Podgląd</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Drukuj</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Zamknij</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1724,7 +1759,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/printoptions.ui" line="202"/> <source>Notes on top</source> - <translation>Notatki na górze</translation> + <translation>Opis na górze</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="219"/> @@ -1744,7 +1779,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/printoptions.ui" line="338"/> <source>Notes height (0% - 52%)</source> - <translation>Notatki (0% - 52%)</translation> + <translation>Opis (0% - 52%)</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="354"/> @@ -1808,70 +1843,70 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Ustaw czas trwania: 10 minut</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Skala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Linijka</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Pomiar parametrów fragmentu nurkowania</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Skalowanie profilu</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Edytuj</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>powietrze</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Przejście na obieg otwarty</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> początek</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> koniec</translation> @@ -1880,72 +1915,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Nurkownie #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Max głębokość: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Czas: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Użyty gaz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Balast:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Opis:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Widzialność:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Ocena:</translation> </message> @@ -1958,7 +1993,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>POWIETRZE</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Usuń ten punkt</translation> </message> @@ -1985,7 +2020,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation> </message> </context> <context> @@ -2055,42 +2090,42 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Łączenie...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Pobieranie zakończone</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Błąd pobierania: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Błąd połączenia:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Niepoprawny identyfikator użytkownika!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Nie można przetworzyć odpowiedzi!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Pobieranie zakończone sukcesem!</translation> </message> @@ -2106,17 +2141,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,20 +2159,20 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> - <translation>Informacja</translation> + <translation>Informacje</translation> </message> </context> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2181,8 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Pobierz dane o miejscu</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2215,30 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Wyślij</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Przekroczony czas</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Przesyłanie danych...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Rodzaj</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Kliknięcie tu usunie ten balast z listy.</translation> </message> @@ -2211,74 +2246,74 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Rok > Miesiąc / grupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Czas trwania całkowity</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation>średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation>najkrótszy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation>najdłuższy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Głębokość (%1) średnia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation>minimalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation>maksymalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -2351,9 +2386,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2387,10 +2422,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Błąd odczytu '%s'</translation> </message> @@ -2401,8 +2436,8 @@ Maximum</source> <translation>Nie udało sie odczytać '%s'. Użyj importu z pliku CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation> </message> @@ -2679,23 +2714,23 @@ Maximum</source> <translation>Nie można otworzyć arkusza stylów (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Nie znaleziono gazu %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Zbyt wiele rodzajów gazu</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2708,42 +2743,42 @@ w oparciu o GFlow = %.0f oraz GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Zmiana gazu na %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Zużycie gazu: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s z %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> @@ -3262,7 +3297,7 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <message> <location filename="../uemis-downloader.c" line="400"/> <source>divespot data id</source> - <translation>dane o miejscu nurkowania id</translation> + <translation>dane o miejscu nurkowania</translation> </message> <message> <location filename="../uemis-downloader.c" line="402"/> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index c3e1c0087..0fdd15d75 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar esta garrafa.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>A garrafa não pode ser eliminada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation> </message> @@ -153,22 +153,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Apelido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -176,12 +176,12 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>pés cúbicos/min</translation> </message> @@ -189,87 +189,97 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Mostrar caixa de busca</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>colapsar outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>criar nova viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>juntar viagem com a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>juntar viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>eliminar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>salvar como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>exportar como UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>mudar os tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Gravar mergulhos como...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Salvar aquivo como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Ficheiros UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>mesclar mergulhos selecionados</translation> </message> @@ -325,12 +335,12 @@ remover o computador de mergulho seleccionado?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Erro na posição</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Uma ou mais patamares serão eliminados com esta operação. @@ -340,37 +350,37 @@ Por favor, remova-os primeiro</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>AR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gás utilizado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Descartar o planejamento?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Está prestes a eliminar o planejamento.</translation> </message> @@ -378,17 +388,17 @@ Por favor, remova-os primeiro</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Pontos do plano de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Gases disponíveis</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>adicionar ponto ao mergulho</translation> </message> @@ -396,67 +406,67 @@ Por favor, remova-os primeiro</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>CNS máx</translation> </message> @@ -464,71 +474,95 @@ Por favor, remova-os primeiro</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -854,22 +888,22 @@ Por favor, remova-os primeiro</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>L</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>O</translation> </message> @@ -976,7 +1010,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importar arquivos</translation> </message> @@ -1006,112 +1040,112 @@ Por favor, remova-os primeiro</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>%Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importar do %computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importar &GPS de serviço Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>%Editar nomes dos dispositivos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Ligar/desligar &Zoom</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Tudo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Manual do utilizador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&lanear mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importar CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importar CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importar de Divelogs.de</translation> </message> @@ -1126,174 +1160,174 @@ Por favor, remova-os primeiro</translation> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Adicionar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Auto agrupar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Computador de mergulho anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Esquerda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Computador de mergulho seguinte</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Direita</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Selecionar eventos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Introduzir Plano</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Sobre o Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, salve ou cancele o mergulho atual antes de fechar o arquivo.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Por favor, salve ou cancele o mergulho atual antes de planejar um mergulho.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, salve ou cancele o mergulho atual antes de tentar asicionar um mergulho.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Não foi possível encontrar o manual do Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Deseja gravar as alterações feitas ao ficheiro %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Deseja gravar as alterações feitas ao ficheiro de dados?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Salvar alterações?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Primeiro termine a edição atual antes de editar outro.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Salvar aquivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, salve ou cancele o mergulho atual antes de abrir um novo arquivo.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Ficheiros UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1593,22 +1627,22 @@ Por favor, remova-os primeiro</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Abrir o logbook padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1808,70 +1842,70 @@ Por favor, remova-os primeiro</translation> <translation>Duração prevista: 10 minutos</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Escala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Régua</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Medir propriedades dos segmentos do mergulho</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Redimensionar o mergulho ao tamanho do ecrã</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Troca de emergência para circuito aberto</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>início</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -1880,72 +1914,72 @@ Por favor, remova-os primeiro</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Profundidade máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>CNS máximo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -1958,7 +1992,7 @@ Por favor, remova-os primeiro</translation> <translation>AR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Remover este ponto</translation> </message> @@ -2055,42 +2089,42 @@ Por favor, remova-os primeiro</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Serviço web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Conectando...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Erro de conexão:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Identificação de utilizador inválida !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Não é possível analisar a resposta !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Operação de transferência bem sucedida!</translation> </message> @@ -2106,17 +2140,17 @@ Por favor, remova-os primeiro</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2158,7 @@ Por favor, remova-os primeiro</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Informação</translation> </message> @@ -2132,12 +2166,12 @@ Por favor, remova-os primeiro</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2180,8 @@ Por favor, remova-os primeiro</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Transferir dados de localização</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,12 +2214,12 @@ Por favor, remova-os primeiro</translation> <translation>Carregar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2193,17 +2227,17 @@ Por favor, remova-os primeiro</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Ao clicar aqui irá remover este sistema de lastro</translation> </message> @@ -2211,79 +2245,79 @@ Por favor, remova-os primeiro</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Ano >Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2356,9 +2390,9 @@ Médio</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2426,10 @@ Médio</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> @@ -2406,8 +2440,8 @@ Médio</translation> <translation>Não foi possível ler '%s'. Use importar para ficheiros CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation> </message> @@ -2685,23 +2719,23 @@ Médio</translation> <translation>Não é possível abrir a folha de estilos (%s)%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Não é possível encontrar o gás %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Demasiadas misturas de gás</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2714,42 +2748,42 @@ baseado em GFlow = %.0f e GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u em %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Permanecer a %.*f %s durante %d:%02d min - runtime %d:%02u a %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Mudar para a mistura %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Consumo de gás: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 783b23216..72e57ec29 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -115,17 +115,17 @@ <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar esta garrafa.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>A garrafa não pode ser eliminada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation> </message> @@ -153,22 +153,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Alcunha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -176,12 +176,12 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>pés cúbicos/min</translation> </message> @@ -189,87 +189,97 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Mostrar caixa de busca</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>colapsar outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>criar nova viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>juntar viagem com a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>juntar viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>eliminar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>marcar mergulho(s) como inválido(s)</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>gravar como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>exportar como UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>mudar os tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>exportar mergulho(s) para divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Gravar mergulhos como...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Gravar ficheiro como</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Ficheiros UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>juntar os mergulhos seleccionados</translation> </message> @@ -325,12 +335,12 @@ remover o computador de mergulho seleccionado?</translation> <translation>30 pés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Erro na posição</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Uma ou mais patamares serão eliminados com esta operação. @@ -340,37 +350,37 @@ Por favor, remova-os primeiro</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Ar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Eliminar o plano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Está prestes a eliminar o plano.</translation> </message> @@ -378,17 +388,17 @@ Por favor, remova-os primeiro</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Pontos do plano de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Gases disponíveis</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>adicionar ponto ao mergulho</translation> </message> @@ -396,67 +406,67 @@ Por favor, remova-os primeiro</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>CNS máx</translation> </message> @@ -464,74 +474,97 @@ Por favor, remova-os primeiro</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation>Resposta inválida do servidor</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Esperada a tag XML 'DiveDateReader'. Em vez disso recebemos '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>A tag XML esperada 'DiveDates' não foi encontrada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation>Resposta XML mal formada. Linha %1: %2</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>Não foi possível criar o ficheiro DLD</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Concluído</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation>A carregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation>A descarregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation>A descarregar %1 mergulhos</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation>Descarga terminada - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation>Descarga corrompida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation>Não foi possível abrir o ficheiro: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation>O ficheiro contém dados corrompidos: -%1</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>Exportação falhou</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation>Carregamento terminado</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Exportação bem sucedida</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation>Erro na descarga: %1</translation> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>O login falhou</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>Não foi possível analisar a resposta</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Erro: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Carregamento terminado</translation> </message> </context> <context> @@ -621,7 +654,7 @@ Por favor, remova-os primeiro</translation> <location filename="../qt-ui/maintab.ui" line="120"/> <location filename="../qt-ui/maintab.cpp" line="437"/> <source>Location</source> - <translation>Localização</translation> + <translation>Local</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="148"/> @@ -651,7 +684,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <source>Water temp</source> - <translation>Temperatura</translation> + <translation>Temperatura da água</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="127"/> @@ -856,22 +889,22 @@ Por favor, remova-os primeiro</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>O</translation> </message> @@ -978,7 +1011,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importar ficheiros</translation> </message> @@ -990,7 +1023,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="311"/> <source>Export &UDDF</source> - <translation>Exportar %UDDF</translation> + <translation>Exportar &UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="314"/> @@ -1008,112 +1041,112 @@ Por favor, remova-os primeiro</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Fechar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Importar do &computador de mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importar &GPS de serviço Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Editar nomes dos computadores</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Renumerar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Ligar/desligar &Zoom</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Estatísticas anuais</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Perfil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Todos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Manual do utilizador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Globo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>P&lanear mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importar CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importar CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Importar a partir de Divelogs.de</translation> </message> @@ -1128,174 +1161,174 @@ Por favor, remova-os primeiro</translation> <translation>Preferências</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Adicionar mergulho</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Agrupar automaticamente</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Computador de mergulho anterior</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Esquerda</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Computador de mergulho seguinte</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Direita</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Seleccionar Eventos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Introduzir Plano</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Sobre o Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Por favor grave ou cancele as edições a este mergulho antes de tentar planear outro.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Manual do utilizador</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Não foi possível encontrar o manual do Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Deseja gravar as alterações feitas ao ficheiro %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Deseja gravar as alterações feitas ao ficheiro de dados?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Termine de editar este mergulho antes de editar um outro.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Gravar ficheiro como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>Ficheiros UDDF (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1595,22 +1628,22 @@ Por favor, remova-os primeiro</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation>É necessário reiniciar a aplicação</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Abrir o logbook padrão</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> @@ -1810,70 +1843,70 @@ Por favor, remova-os primeiro</translation> <translation>Duração prevista: 10 minutos</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Escala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Régua</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Medir propriedades dos segmentos do mergulho</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Redimensionar o mergulho ao tamanho do ecrã</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation>Pn2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation>PHE</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>ar</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Troca de emergência para circuito aberto</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>iniciar</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -1882,72 +1915,72 @@ Por favor, remova-os primeiro</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Prof. Máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>CNS máximo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -1960,7 +1993,7 @@ Por favor, remova-os primeiro</translation> <translation>Ar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Remover este ponto</translation> </message> @@ -2057,42 +2090,42 @@ Por favor, remova-os primeiro</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Serviço web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Ligar ...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation>Descarga terminada</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation>Erro na descarga: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Erro de ligação:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Identificação de utilizador inválida !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Não é possível analisar a resposta !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Operação de transferência bem sucedida!</translation> </message> @@ -2108,17 +2141,17 @@ Por favor, remova-os primeiro</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2126,7 +2159,7 @@ Por favor, remova-os primeiro</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Informação</translation> </message> @@ -2134,12 +2167,12 @@ Por favor, remova-os primeiro</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2148,8 +2181,8 @@ Por favor, remova-os primeiro</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Transferir dados de localização</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2182,12 +2215,12 @@ Por favor, remova-os primeiro</translation> <translation>Carregar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation>A operação demorou demasiado tempo</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation>A transferir dados...</translation> </message> @@ -2195,17 +2228,17 @@ Por favor, remova-os primeiro</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Ao clicar aqui irá remover este sistema de lastro</translation> </message> @@ -2213,79 +2246,79 @@ Por favor, remova-os primeiro</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Ano >Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -2358,9 +2391,9 @@ Média</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2394,10 +2427,10 @@ Média</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> @@ -2408,8 +2441,8 @@ Média</translation> <translation>Não foi possível ler '%s'. Use importar para ficheiros CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation> </message> @@ -2687,23 +2720,23 @@ Média</translation> <translation>Não é possível abrir a folha de estilos (%s)%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Não é possível encontrar o gás %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Demasiadas misturas de gás</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2716,42 +2749,42 @@ baseado em GFlow = %.0f e GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Transição de cota %.*f %s em %d:%02d min - runtime %d:%02u em %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Permanecer a %.*f %s durante %d:%02d min - runtime %d:%02u a %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Alterar gás para %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Consumo de gás: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s de %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> @@ -2990,7 +3023,7 @@ TTS:%umin (calc)</translation> <message> <location filename="../dive.c" line="13"/> <source>boat</source> - <translation>embarcação</translation> + <translation>barco</translation> </message> <message> <location filename="../dive.c" line="13"/> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index f50c4433d..9f3d709a7 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Удалить этот баллон.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Баллон не может быть удален</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Нельзя удалять баллоны, которые используются в погружении.</translation> </message> @@ -153,22 +153,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Имя устройства</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Удалить этот дайв-компьютер.</translation> </message> @@ -176,12 +176,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>куб.фут/мин</translation> </message> @@ -189,87 +189,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Показать поле поиска</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>удалить погружение(-я) из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>создать новую поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>добавить к поездке выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>удалить погружение(-я)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>пометить как некорректные</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>сохранить как</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>экспорт UDDF</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>сдвинуть время</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>выгрузить на divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Сохранить погружения как...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлы (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>объединить выбранные </translation> </message> @@ -325,12 +335,12 @@ <translation>30фут</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Ошибка позиции обработчика</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Одна или несколько остановок будут утеряны во время этой @@ -340,37 +350,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Конечная глубина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Используемый газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>Настройка CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Отменить план?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Вы собираетесь отказаться от плана.</translation> </message> @@ -378,17 +388,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Точки погружения</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Доступные газы</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>Добавить точку погружения</translation> </message> @@ -396,67 +406,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>местоположение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>макс.CNS</translation> </message> @@ -464,72 +474,97 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"/> + <translation>Неверный XML ответ. Строка %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>Ошибка создания DLD-файла</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>Готово</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> - <translation type="unfinished"/> + <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>Невозможно открыть архив: +%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>Ошибка входа</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>Ошибка разбора ответа</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>Ошибка: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Выгрузка завершена</translation> </message> </context> <context> @@ -854,22 +889,22 @@ Please, remove them first.</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>В</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>З</translation> </message> @@ -976,7 +1011,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Импорт файлов</translation> </message> @@ -1006,112 +1041,112 @@ Please, remove them first.</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Импорт данных GPS из сервиса Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>Список дайвкомпьютеров</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Переключить масштаб</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>Статистика за год</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Список погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>Руководство</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Карта</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Импорт CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Импорт CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Импорт с сайта Divelogs.de</translation> </message> @@ -1126,174 +1161,174 @@ Please, remove them first.</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Влево</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Вправо</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Выбрать события</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Ввести план</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Сохраните или отмените изменения перед открытием планировщика.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Руководство не найдено</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Сохранить изменения в файле %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Сохранить изменения в файле журнала?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Закончите редактирование прежде чем редактировать другое.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF файлы (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Язык</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>метр</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>фут</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>литр</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>куб. фут</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>цельсий</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>фаренгейт</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,17 +1473,17 @@ Please, remove them first.</source> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Язык системы</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1525,7 +1560,7 @@ Please, remove them first.</source> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>макс. ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1593,22 +1628,22 @@ Please, remove them first.</source> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>Для смены языка необходимо перезапустить Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Журнал по умолчанию</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1653,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>Просмотр</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Печать</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Закрыть</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1808,70 +1843,70 @@ Please, remove them first.</source> <translation>Длительность: 10 мин</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Масштаб</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Параметры сегмента погружения</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Масштаб по размеру экрана</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Редактировать</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>воздух</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Переход на Откр. Цикл</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -1880,72 +1915,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Погружение №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Макс. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> @@ -1958,7 +1993,7 @@ Please, remove them first.</source> <translation>воздух</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Удалить эту точку</translation> </message> @@ -1985,7 +2020,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Выберите место на карте двойным щелчком мыши.</translation> </message> </context> <context> @@ -2055,42 +2090,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Вебсервис</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Загрузка завершена</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Ошибка загрузки: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Ошибка соединения:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Неверный идентификатор пользователя!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Невозможно разобрать ответ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Успешная загрузка!</translation> </message> @@ -2106,17 +2141,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>мл</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>Бар</translation> </message> @@ -2124,7 +2159,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Информация</translation> </message> @@ -2132,12 +2167,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>кг</translation> </message> @@ -2146,8 +2181,8 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Загрузить данные местоположения</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2215,30 @@ Please, remove them first.</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Передача данных...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Удалить эту грузовую систему.</translation> </message> @@ -2211,79 +2246,79 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>Год > Месяц / Поездка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -2356,9 +2391,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2392,10 +2427,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> @@ -2406,8 +2441,8 @@ Maximum</source> <translation>Ошибка чтения '%s'. Используйте импорт CSV.</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> @@ -2684,23 +2719,23 @@ Maximum</source> <translation>Невозможно открыть файл преобразования (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Не найдена смесь %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Слишком много смесей</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2713,42 +2748,42 @@ based on GFlow = %.0f and GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Переход на %.*f %s за %d:%02d мин - рантайм %d:%02u на смеси %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Оставаться на %.*f %s в течение %d:%02d мин - рантайм %d:%02u на смеси %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Замена смеси на %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Расход газа: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index dba99c135..a3ce292d3 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Voliteľný názov</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation type="unfinished"/> </message> @@ -324,12 +334,12 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation type="unfinished"/> @@ -338,37 +348,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>Vzduch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -376,17 +386,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -394,67 +404,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -462,71 +472,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -852,22 +886,22 @@ Please, remove them first.</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -974,7 +1008,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation type="unfinished"/> </message> @@ -1004,112 +1038,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1124,174 +1158,174 @@ Please, remove them first.</source> <translation>Nastavenia</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Predchádzajúci DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Nasledujúci DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Voľba udalosti</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Plánovanie</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>O Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Užívateľská príručka</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1591,22 +1625,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1806,70 +1840,70 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Editovať</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>vzduch</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Záchrana na OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>začiatok</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>koniec</translation> @@ -1878,72 +1912,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1956,7 +1990,7 @@ Please, remove them first.</source> <translation>Vzduch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2053,42 +2087,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webservis</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Pripájam...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Chyba spojenia</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Neplatný identifikátor užívateľa!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Nemôžem spracovať odpoveď!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Nahrávanie úspešne ukončené!</translation> </message> @@ -2104,17 +2138,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2122,7 +2156,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2130,12 +2164,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2144,7 +2178,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2178,12 +2212,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2191,17 +2225,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Závažie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2209,70 +2243,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2344,9 +2378,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2380,10 +2414,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Chyba pri načítaní '%s'</translation> </message> @@ -2394,8 +2428,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2672,23 +2706,23 @@ Maximum</source> <translation>Nemôžem otvoriť stylesheet (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Neviem nájsť zmes %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Príliš veľa zmesí</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2701,42 +2735,42 @@ zrátaný s GFlow = %.0f a GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Zmena plynu na %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Spotreba plynu: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s z %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 82d21b1b5..70518641f 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -112,20 +112,20 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"/> + <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation>Klicka här för att ta bort denna flaska</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan inte tas bort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denna gas används. Bara flaskor som inte används kan tas bort</translation> </message> @@ -153,22 +153,22 @@ radera den valda dykdatorn?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>Enhetsid</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klicka här för att ta bort denna dykdator</translation> </message> @@ -176,12 +176,12 @@ radera den valda dykdatorn?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -189,87 +189,97 @@ radera den valda dykdatorn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation>Visa sökruta</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation>kollapsa andra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation>ta bort dyk från resmål</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation>skapa nytt resmål ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation>lägg till dyk(en) till resmål direkt ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation>sammanfoga resmål med resmål ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation>sammanfoga resmål med resmål nedan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>radera dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation>Spara som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation>Exportera som UDDF fil</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation>skifta tider</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation>Spara dyk som...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>Sammanslå dyk</translation> </message> @@ -325,12 +335,12 @@ radera den valda dykdatorn?</translation> <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation>Hantera possitionsfel</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation>Ett eller flera av dina stop försvinner med denna operation @@ -340,37 +350,37 @@ vänligen ta bort dessa först.</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation>Kassera plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation>Du kommer kassera din plan</translation> </message> @@ -378,17 +388,17 @@ vänligen ta bort dessa först.</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation>Dykplaneringspunkter</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation>Tillgängliga gaser</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation>lägg till dykdatapunkt</translation> </message> @@ -396,67 +406,67 @@ vänligen ta bort dessa först.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation>dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation>flaska</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>plats</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -464,73 +474,98 @@ vänligen ta bort dessa först.</translation> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> - <translation type="unfinished"/> + <translation>Ogiltigt svar från server</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"/> + <translation>Förväntade XML tag 'DiveDateReader' men fick istället '%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"/> + <translation>Förväntad XML tagg 'DiveDates' gick ej att finna</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> + <translation>Felformaterat XML svar. Rad %1: %2</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> - <source>Uploading dive list...</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> + <source>Uploading dive list...</source> + <translation>Laddar upp dyklista...</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> - <translation type="unfinished"/> + <translation>Laddar ner dyklista...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"/> + <translation>Laddar ner %1 dyk...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>Nedladdning klar - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>Misslyckad nedladdning</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> + <translation>Arkivet kunde inte öppnas: +%1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>Uppladdning klar</translation> + </message> </context> <context> <name>DownloadFromDCWidget</name> @@ -854,22 +889,22 @@ vänligen ta bort dessa först.</translation> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -976,7 +1011,7 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>Importera filer</translation> </message> @@ -1006,112 +1041,112 @@ vänligen ta bort dessa först.</translation> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>&Avsluta</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation>Ladda ner från dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation>Importera &GPSdata från Subsurface webbtjänst</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation>&Ändra Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation>&Renumrering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation>Zoom av/på</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation>&Årsstatistik</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation>Dyklista</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Profil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>Alla</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation>&Användarmanual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation>Glob</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation>Pl&anera Dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation>Importera CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation>Importera CS&V</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation>Import från Divelogs.de</translation> </message> @@ -1126,174 +1161,174 @@ vänligen ta bort dessa först.</translation> <translation>Inställningar</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>Nytt dyk</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>Autogruppering</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>Föregående dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>Vänster</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>Nästa dykdator</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>Höger</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Välj händelser</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Skriv plan</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Om Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker planera ett dyk.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Användarmanual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation>Kan inte hitta Subsurface manualen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>Vill du spara ändringarna gjorda i filen %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation>Vill du spara ändringarna gjorda i datafilen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation>Ändringar förloras om du inte sparar dom.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation>Först avsluta den aktuella upplagan du försöker göra en annan.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF filer (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> @@ -1318,7 +1353,7 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>Språk</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1393,12 +1428,12 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>meter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>fot</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1413,22 +1448,22 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>liter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>ft³</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>celsius</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>fahrenheit</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1438,17 +1473,17 @@ vänligen ta bort dessa först.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>Systemets standardvärde</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1525,7 +1560,7 @@ vänligen ta bort dessa först.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>max ppO₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1593,22 +1628,22 @@ vänligen ta bort dessa först.</translation> <translation>GFHigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>Omstart krävs</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation>Välj standard loggfil</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> @@ -1618,17 +1653,17 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>Förhandsvisning</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>Skriv ut</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>Stäng</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1808,70 +1843,70 @@ vänligen ta bort dessa först.</translation> <translation>Sätt varaktighet: 10 minuter</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation>Skala</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation>Linjal</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation>Mätegenskaper på dyksegment</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation>Skala dyk till skärmstorlek</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Redigera</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>luft</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Bailout till öppet system</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -1880,72 +1915,72 @@ vänligen ta bort dessa först.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation>Maxdjup: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation>Varaktighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation>Gas använd:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation>Vikter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation>Ranking:</translation> </message> @@ -1958,7 +1993,7 @@ vänligen ta bort dessa först.</translation> <translation>LUFT</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation>Ta bort denna punkt</translation> </message> @@ -1985,7 +2020,7 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation> </message> </context> <context> @@ -2055,42 +2090,42 @@ vänligen ta bort dessa först.</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Webbtjänst</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> - <translation>Kontaktar...</translation> + <translation>Ansluter...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>Nedladdning klar</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>Nedladdningsfel: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Kontaktfel:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Ogiltigt användarid!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Kan inte tolka respons</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Nedladdning lyckades!</translation> </message> @@ -2106,17 +2141,17 @@ vänligen ta bort dessa först.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2124,7 +2159,7 @@ vänligen ta bort dessa först.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation>Information</translation> </message> @@ -2132,12 +2167,12 @@ vänligen ta bort dessa först.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2146,8 +2181,8 @@ vänligen ta bort dessa först.</translation> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> - <translation>Ladda ner platsdata</translation> + <source>Webservice Connection</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2180,30 +2215,30 @@ vänligen ta bort dessa först.</translation> <translation>Ladda upp</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>Begäran tog för lång tid</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>Överför data...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Klicka här för att ta bort detta viktsystem</translation> </message> @@ -2211,76 +2246,76 @@ vänligen ta bort dessa först.</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation>År > Månad / Resmål</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation>Varaktighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation>Kortaste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation>Längsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation>Djup (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2353,9 +2388,9 @@ Medel</translation> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2389,10 +2424,10 @@ Medel</translation> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Kunde inte öppna '%s'</translation> </message> @@ -2403,8 +2438,8 @@ Medel</translation> <translation>Misslyckades att läsa %s'. Använd Import av CSV filer</translation> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximalt antalet kolumner i CSV import är %d</translation> </message> @@ -2681,23 +2716,23 @@ Medel</translation> <translation>Kunde inte öppna stilmall (%s)%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Kan inte hitta gasen %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>För många gasblandningar</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2710,42 +2745,42 @@ baserad på GFlow = %.0f och GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Dyk till %.*f %s i %d:%02d min - totaltid %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Stanna vid %.*f %s för %d:%02d min - totaltid %d:%02u on %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Byt till gas %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Gasanvändning: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s av %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index 439b3bff0..e57feba89 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -115,17 +115,17 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -152,22 +152,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>Mô hình</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>Tên</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +175,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -188,87 +188,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation type="unfinished"/> </message> @@ -324,12 +334,12 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> <translation type="unfinished"/> @@ -338,37 +348,37 @@ Please, remove them first.</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -376,17 +386,17 @@ Please, remove them first.</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> <translation type="unfinished"/> </message> @@ -394,67 +404,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>CNS tối đa</translation> </message> @@ -462,71 +472,95 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> <translation type="unfinished"/> </message> </context> @@ -852,22 +886,22 @@ Please, remove them first.</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -974,7 +1008,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation type="unfinished"/> </message> @@ -1004,112 +1038,112 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> <translation>Hồ sơ</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>Thông tin</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> <translation type="unfinished"/> </message> @@ -1124,174 +1158,174 @@ Please, remove them first.</source> <translation>Tùy biến</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>DC trước</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>DC tiếp theo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>Chọn sự kiện</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>Nhập vào kế hoạch</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>Thông tin</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>Mở tập tin</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>Hướng dẫn sử dụng</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>Lưu các thay đổi?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1591,22 +1625,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> @@ -1806,70 +1840,70 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>Chỉnh sửa</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>Thoát đến OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -1878,72 +1912,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1956,7 +1990,7 @@ Please, remove them first.</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> <translation type="unfinished"/> </message> @@ -2053,42 +2087,42 @@ Please, remove them first.</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>Dịch vụ web</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>Đang kết nối...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>Lỗi kết nối:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> <translation>Nhận dạng người dùng không hợp lệ!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>Không nhận được trả lời!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>Tải về thành công!</translation> </message> @@ -2104,17 +2138,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2122,7 +2156,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2130,12 +2164,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>ký</translation> </message> @@ -2144,7 +2178,7 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> @@ -2178,12 +2212,12 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> <translation type="unfinished"/> </message> @@ -2191,17 +2225,17 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> @@ -2209,70 +2243,70 @@ Please, remove them first.</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2344,9 +2378,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2380,10 +2414,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>Thất bại khi đọc dữ liệu '%s'</translation> </message> @@ -2394,8 +2428,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2672,23 +2706,23 @@ Maximum</source> <translation>Không thể mở bảng (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>Không tìm thấy dưỡng khí %d%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>Quá nhiều dưỡng khí được trộn</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2701,42 +2735,42 @@ dựa trên GFlow = %.0f và GFhigh = %.0f </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>Chuyển đến %.*f %s trong %d:%02d phút - thời gian chạy %d:%02u tại %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>Ở %.*f %s đối với %d:%02d phút - thời gian chạy %d:%02u ở %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>Chuyển dưỡng khí sang %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>Dưỡng khí tiêu thụ: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s of %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index a9bfa6260..68e2e2533 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -4,7 +4,7 @@ <message> <location filename="../qt-ui/csvimportdialog.ui" line="31"/> <source>Import File (CSV)</source> - <translation type="unfinished"/> + <translation>匯入檔案 (CSV)</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="40"/> @@ -19,12 +19,12 @@ <message> <location filename="../qt-ui/csvimportdialog.ui" line="197"/> <source>Field Separator</source> - <translation type="unfinished"/> + <translation>欄位分隔線</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="65"/> <source>Field Configuration</source> - <translation type="unfinished"/> + <translation>欄位設定</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="14"/> @@ -49,22 +49,22 @@ <message> <location filename="../qt-ui/csvimportdialog.ui" line="146"/> <source>Cns</source> - <translation type="unfinished"/> + <translation>Cns</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="163"/> <source>Stopdepth</source> - <translation type="unfinished"/> + <translation>停留深度</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="215"/> <source>Pre-configured imports</source> - <translation type="unfinished"/> + <translation>未設定前的匯入</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.cpp" line="71"/> <source>Open CSV Log File</source> - <translation type="unfinished"/> + <translation>開啟 CSV 日誌檔案</translation> </message> <message> <location filename="../qt-ui/csvimportdialog.cpp" line="71"/> @@ -87,22 +87,22 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>WorkPress</source> - <translation type="unfinished"/> + <translation>WorkPress</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>StartPress</source> - <translation type="unfinished"/> + <translation>StartPress</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>EndPress</source> - <translation type="unfinished"/> + <translation>EndPress</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>Switch at</source> - <translation type="unfinished"/> + <translation>交換於 </translation> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> @@ -115,19 +115,19 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="166"/> + <location filename="../qt-ui/models.cpp" line="154"/> <source>Clicking here will remove this cylinder.</source> - <translation type="unfinished"/> + <translation>於此處按下將移除此氣瓶。</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="388"/> + <location filename="../qt-ui/models.cpp" line="376"/> <source>Cylinder cannot be removed</source> - <translation type="unfinished"/> + <translation>氣瓶無法移除</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="389"/> + <location filename="../qt-ui/models.cpp" line="377"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> - <translation type="unfinished"/> + <translation>此為使用氣體。只有在潛水時，未使用的氣體才可以被移除。</translation> </message> </context> <context> @@ -153,35 +153,35 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Model</source> <translation>模型</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Device ID</source> <translation>裝置ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1245"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Nickname</source> <translation>別名</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1267"/> + <location filename="../qt-ui/models.cpp" line="1255"/> <source>Clicking here will remove this divecomputer.</source> - <translation type="unfinished"/> + <translation>於此處按下將會移除此潛水電腦。</translation> </message> </context> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1106"/> + <location filename="../qt-ui/models.cpp" line="1094"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1108"/> + <location filename="../qt-ui/models.cpp" line="1096"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -189,87 +189,97 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="41"/> + <location filename="../qt-ui/divelistview.cpp" line="42"/> <source>Show Search Box</source> - <translation type="unfinished"/> + <translation>顯示搜尋盒</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="680"/> + <location filename="../qt-ui/divelistview.cpp" line="704"/> <source>expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="681"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="682"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>collapse others</source> - <translation type="unfinished"/> + <translation>摺疊其它</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="684"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>remove dive(s) from trip</source> - <translation type="unfinished"/> + <translation>自旅程中移除潛水(多筆)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="685"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>create new trip above</source> - <translation type="unfinished"/> + <translation>於上方新增旅程</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="686"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="689"/> + <location filename="../qt-ui/divelistview.cpp" line="713"/> <source>merge trip with trip above</source> - <translation type="unfinished"/> + <translation>與上方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="690"/> + <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip below</source> - <translation type="unfinished"/> + <translation>與下方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="694"/> + <location filename="../qt-ui/divelistview.cpp" line="718"/> <source>delete dive(s)</source> <translation>刪除潛水(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="698"/> + <location filename="../qt-ui/divelistview.cpp" line="720"/> + <source>mark dive(s) invalid</source> + <translation>標示無效的潛水 (所選)</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>save As</source> - <translation type="unfinished"/> + <translation>另存為</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="699"/> + <location filename="../qt-ui/divelistview.cpp" line="727"/> <source>export As UDDF</source> - <translation type="unfinished"/> + <translation>匯出成 UDDF </translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="700"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <source>shift times</source> - <translation type="unfinished"/> + <translation>位移時間</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> + <source>upload dive(s) to divelogs.de</source> + <translation>上傳潛水 (所選) 至 divelogs.de</translation> + </message> + <message> + <location filename="../qt-ui/divelistview.cpp" line="757"/> <source>Save Dives As...</source> - <translation type="unfinished"/> + <translation>儲存潛水為...</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="776"/> <source>Save File as</source> - <translation type="unfinished"/> + <translation>另存新檔</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="777"/> <source>UDDF files (*.uddf *.UDDF)</source> - <translation type="unfinished"/> + <translation>UDDF 檔案 (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="696"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>merge selected dives</source> <translation>合併所選擇的潛水</translation> </message> @@ -279,22 +289,22 @@ <message> <location filename="../qt-ui/diveplanner.ui" line="71"/> <source>Bottom SAC</source> - <translation type="unfinished"/> + <translation>水底耗氣量 SAC</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="85"/> <source>SAC on DECO Stop</source> - <translation type="unfinished"/> + <translation>減壓停留耗氣量 SAC</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="78"/> <source>GFHigh</source> - <translation type="unfinished"/> + <translation>GFhigh</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="98"/> <source>GFLow</source> - <translation type="unfinished"/> + <translation>GFlow</translation> </message> <message> <location filename="../qt-ui/diveplanner.ui" line="125"/> @@ -309,7 +319,7 @@ <message> <location filename="../qt-ui/diveplanner.ui" line="181"/> <source>ATM Pressure</source> - <translation type="unfinished"/> + <translation>ATM 壓力</translation> </message> </context> <context> @@ -325,137 +335,138 @@ <translation>30ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="384"/> + <location filename="../qt-ui/diveplanner.cpp" line="386"/> <source>Handler Position Error</source> - <translation type="unfinished"/> + <translation>程式位置錯誤</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="385"/> + <location filename="../qt-ui/diveplanner.cpp" line="387"/> <source>One or more of your stops will be lost with this operations, Please, remove them first.</source> - <translation type="unfinished"/> + <translation>在這次流程，有１或多個停留將會被跳過， +請預先移除它們。</translation> </message> </context> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="467"/> + <location filename="../qt-ui/diveplanner.cpp" line="470"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1080"/> + <location filename="../qt-ui/diveplanner.cpp" line="1099"/> <source>Final Depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1081"/> + <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>Duration</source> <translation>時間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1082"/> + <location filename="../qt-ui/diveplanner.cpp" line="1101"/> <source>Used Gas</source> - <translation type="unfinished"/> + <translation>Used Gas 已使用的氣體</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1083"/> + <location filename="../qt-ui/diveplanner.cpp" line="1102"/> <source>CC Set Point</source> - <translation type="unfinished"/> + <translation>密閉式循環設定點</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1278"/> + <location filename="../qt-ui/diveplanner.cpp" line="1307"/> <source>Discard the Plan?</source> - <translation type="unfinished"/> + <translation>取消這次計畫？</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1279"/> + <location filename="../qt-ui/diveplanner.cpp" line="1308"/> <source>You are about to discard your plan.</source> - <translation type="unfinished"/> + <translation>您將要放棄你的計劃。</translation> </message> </context> <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="944"/> + <location filename="../qt-ui/diveplanner.cpp" line="957"/> <source>Dive Planner Points</source> - <translation type="unfinished"/> + <translation>潛水計畫指示</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="947"/> + <location filename="../qt-ui/diveplanner.cpp" line="960"/> <source>Available Gases</source> - <translation type="unfinished"/> + <translation>可用氣瓶</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="964"/> + <location filename="../qt-ui/diveplanner.cpp" line="977"/> <source>add dive data point</source> - <translation type="unfinished"/> + <translation>新增潛水資料點</translation> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1137"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1138"/> <source>date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1152"/> + <location filename="../qt-ui/models.cpp" line="1140"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1141"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1155"/> + <location filename="../qt-ui/models.cpp" line="1143"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1144"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1145"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1150"/> <source>location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1159"/> + <location filename="../qt-ui/models.cpp" line="1147"/> <source>SAC</source> - <translation>SAC</translation> + <translation>耗氣量 SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1148"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1149"/> <source>maxCNS</source> <translation>最大 CNS</translation> </message> @@ -463,72 +474,97 @@ Please, remove them first.</source> <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="464"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="472"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="518"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="548"/> + <source>Cannot create DLD file</source> + <translation>無法建立 DLD 檔案</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="772"/> + <source>Done</source> + <translation>完成</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="609"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="640"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="688"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="732"/> <source>Download finished - %1</source> - <translation type="unfinished"/> + <translation>下載結束 - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="749"/> <source>Corrupted download</source> - <translation type="unfinished"/> + <translation>中斷下載</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="750"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"/> + <translation>此存檔無法被開啟: +%1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/> - <source>The archive contains corrupt data: -%1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> + <source>Upload failed</source> + <translation>上傳失敗</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/> - <source>Upload finished</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <source>Upload successful</source> + <translation>上傳成功</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/> - <source>Download error: %1</source> - <translation type="unfinished"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="792"/> + <source>Login failed</source> + <translation>登入失敗</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="795"/> + <source>Cannot parse response</source> + <translation>回覆無法解析</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <source>Error: %1</source> + <translation>錯誤: %1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="773"/> + <source>Upload finished</source> + <translation>上傳結束</translation> </message> </context> <context> @@ -570,7 +606,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/> <source>Device or Mount Point</source> - <translation type="unfinished"/> + <translation>裝置或連接處</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/> @@ -585,7 +621,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/> <source>Always prefer downloaded dives</source> - <translation type="unfinished"/> + <translation>總是保留已下載的潛水</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/> @@ -694,12 +730,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/maintab.ui" line="406"/> <source>Interval</source> - <translation type="unfinished"/> + <translation>區間</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="425"/> <source>Gases Used</source> - <translation type="unfinished"/> + <translation>消耗氣體</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="444"/> @@ -710,7 +746,7 @@ Please, remove them first.</source> <location filename="../qt-ui/maintab.ui" line="463"/> <location filename="../qt-ui/maintab.ui" line="721"/> <source>SAC</source> - <translation>SAC</translation> + <translation>耗氣量 SAC</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="482"/> @@ -750,7 +786,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/maintab.ui" line="615"/> <source>Salinity</source> - <translation type="unfinished"/> + <translation>鹽度</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="652"/> @@ -790,17 +826,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/maintab.cpp" line="74"/> <source>Add Cylinder</source> - <translation type="unfinished"/> + <translation>新增氣瓶</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="77"/> <source>Weights</source> - <translation type="unfinished"/> + <translation>配重</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="78"/> <source>Add Weight System</source> - <translation type="unfinished"/> + <translation>增加配重系統</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="408"/> @@ -811,7 +847,7 @@ Please, remove them first.</source> <location filename="../qt-ui/maintab.cpp" line="386"/> <location filename="../qt-ui/maintab.cpp" line="410"/> <source>Trip Notes</source> - <translation type="unfinished"/> + <translation>旅程比季</translation> </message> <message> <location filename="../qt-ui/maintab.cpp" line="37"/> @@ -853,22 +889,22 @@ Please, remove them first.</source> <translation>未知</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="957"/> + <location filename="../qt-ui/maintab.cpp" line="960"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="958"/> + <location filename="../qt-ui/maintab.cpp" line="961"/> <source>W</source> <translation>W</translation> </message> @@ -975,7 +1011,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="300"/> <location filename="../qt-ui/mainwindow.ui" line="303"/> - <location filename="../qt-ui/mainwindow.cpp" line="169"/> + <location filename="../qt-ui/mainwindow.cpp" line="171"/> <source>Import Files</source> <translation>匯入檔案</translation> </message> @@ -987,7 +1023,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="311"/> <source>Export &UDDF</source> - <translation type="unfinished"/> + <translation>匯出 UDDF</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="314"/> @@ -1005,114 +1041,114 @@ Please, remove them first.</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="335"/> + <location filename="../qt-ui/mainwindow.ui" line="338"/> <source>&Quit</source> <translation>結束</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="343"/> + <location filename="../qt-ui/mainwindow.ui" line="349"/> <source>Import from &dive computer</source> - <translation type="unfinished"/> + <translation>從潛水電腦匯入</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="351"/> + <location filename="../qt-ui/mainwindow.ui" line="357"/> <source>Import &GPS data from Subsurface Service</source> - <translation type="unfinished"/> + <translation>自 Subsurface 服務匯入 GPS 資料</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="354"/> + <location filename="../qt-ui/mainwindow.ui" line="360"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="359"/> + <location filename="../qt-ui/mainwindow.ui" line="365"/> <source>&Edit Device Names</source> - <translation type="unfinished"/> + <translation>編輯裝置名稱</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="367"/> + <location filename="../qt-ui/mainwindow.ui" line="373"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="372"/> + <location filename="../qt-ui/mainwindow.ui" line="378"/> <source>&Renumber</source> - <translation type="unfinished"/> + <translation>重新編號</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="375"/> + <location filename="../qt-ui/mainwindow.ui" line="381"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="388"/> + <location filename="../qt-ui/mainwindow.ui" line="394"/> <source>Toggle &Zoom</source> - <translation type="unfinished"/> + <translation>變焦切換</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="393"/> + <location filename="../qt-ui/mainwindow.ui" line="399"/> <source>&Yearly Statistics</source> - <translation type="unfinished"/> + <translation>年統計</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="396"/> + <location filename="../qt-ui/mainwindow.ui" line="402"/> <source>Ctrl+Y</source> - <translation type="unfinished"/> + <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="401"/> + <location filename="../qt-ui/mainwindow.ui" line="407"/> <source>Dive List</source> - <translation type="unfinished"/> + <translation>潛水列表</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="409"/> + <location filename="../qt-ui/mainwindow.ui" line="415"/> <source>Profile</source> - <translation>潛水記錄</translation> + <translation>描述</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="417"/> + <location filename="../qt-ui/mainwindow.ui" line="423"/> <source>Info</source> <translation>資訊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="425"/> + <location filename="../qt-ui/mainwindow.ui" line="431"/> <source>All</source> <translation>全部</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="464"/> + <location filename="../qt-ui/mainwindow.ui" line="473"/> <source>User &Manual</source> - <translation type="unfinished"/> + <translation>使用者說明</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="472"/> + <location filename="../qt-ui/mainwindow.ui" line="481"/> <source>Globe</source> - <translation type="unfinished"/> + <translation>Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="480"/> + <location filename="../qt-ui/mainwindow.ui" line="489"/> <source>P&lan Dive</source> - <translation type="unfinished"/> + <translation>計畫潛水</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="483"/> + <location filename="../qt-ui/mainwindow.ui" line="492"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="488"/> + <location filename="../qt-ui/mainwindow.ui" line="497"/> <source>Import CSV</source> - <translation type="unfinished"/> + <translation>匯入 CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="491"/> + <location filename="../qt-ui/mainwindow.ui" line="500"/> <source>Import CS&V</source> - <translation type="unfinished"/> + <translation>匯入 CSV</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="496"/> + <location filename="../qt-ui/mainwindow.ui" line="505"/> <source>Import from Divelogs.de</source> - <translation type="unfinished"/> + <translation>自 Divelogs.de 匯入</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="322"/> @@ -1125,176 +1161,176 @@ Please, remove them first.</source> <translation>環境設定</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="338"/> + <location filename="../qt-ui/mainwindow.ui" line="341"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="346"/> + <location filename="../qt-ui/mainwindow.ui" line="352"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="364"/> + <location filename="../qt-ui/mainwindow.ui" line="370"/> <source>Add Dive</source> <translation>增加潛水</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="383"/> + <location filename="../qt-ui/mainwindow.ui" line="389"/> <source>Auto Group</source> <translation>增加群組</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="404"/> + <location filename="../qt-ui/mainwindow.ui" line="410"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="412"/> + <location filename="../qt-ui/mainwindow.ui" line="418"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="420"/> + <location filename="../qt-ui/mainwindow.ui" line="426"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="428"/> + <location filename="../qt-ui/mainwindow.ui" line="434"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="433"/> + <location filename="../qt-ui/mainwindow.ui" line="439"/> <source>Prev DC</source> <translation>上一個 DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="436"/> + <location filename="../qt-ui/mainwindow.ui" line="442"/> <source>Left</source> <translation>左邊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="441"/> + <location filename="../qt-ui/mainwindow.ui" line="447"/> <source>Next DC</source> <translation>下一個 DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="444"/> + <location filename="../qt-ui/mainwindow.ui" line="450"/> <source>Right</source> <translation>右邊</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="449"/> + <location filename="../qt-ui/mainwindow.ui" line="455"/> <source>Select Events</source> <translation>選擇事件</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="454"/> + <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Input Plan</source> <translation>輸入計畫</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="459"/> + <location filename="../qt-ui/mainwindow.ui" line="465"/> <source>About Subsurface</source> <translation>關於 Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="467"/> + <location filename="../qt-ui/mainwindow.ui" line="476"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> + <location filename="../qt-ui/mainwindow.ui" line="484"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="111"/> + <location filename="../qt-ui/mainwindow.cpp" line="113"/> <source>Open File</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="500"/> + <location filename="../qt-ui/mainwindow.cpp" line="502"/> <source>User Manual</source> <translation>使用者說明</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="504"/> + <location filename="../qt-ui/mainwindow.cpp" line="506"/> <source>Cannot find the Subsurface manual</source> - <translation>無法找到Subsurface使用說明</translation> + <translation>無法找到 Subsurface 使用說明</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="541"/> + <location filename="../qt-ui/mainwindow.cpp" line="543"/> <source>Do you want to save the changes you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存？</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="543"/> + <location filename="../qt-ui/mainwindow.cpp" line="545"/> <source>Do you want to save the changes you made in the datafile?</source> - <translation type="unfinished"/> + <translation>您是否要對資料檔案所做的修改進行儲存？</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="550"/> <source>Save Changes?</source> <translation>儲存變更?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="549"/> + <location filename="../qt-ui/mainwindow.cpp" line="551"/> <source>Changes will be lost if you don't save them.</source> - <translation type="unfinished"/> + <translation>如果不進行儲存，所做變更將會遺失。</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>First finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="198"/> - <location filename="../qt-ui/mainwindow.cpp" line="743"/> + <location filename="../qt-ui/mainwindow.cpp" line="200"/> + <location filename="../qt-ui/mainwindow.cpp" line="745"/> <source>Save File as</source> - <translation type="unfinished"/> + <translation>另存新檔</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> - <location filename="../qt-ui/mainwindow.cpp" line="146"/> - <location filename="../qt-ui/mainwindow.cpp" line="225"/> - <location filename="../qt-ui/mainwindow.cpp" line="252"/> - <location filename="../qt-ui/mainwindow.cpp" line="288"/> - <location filename="../qt-ui/mainwindow.cpp" line="865"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> + <location filename="../qt-ui/mainwindow.cpp" line="148"/> + <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="254"/> + <location filename="../qt-ui/mainwindow.cpp" line="290"/> + <location filename="../qt-ui/mainwindow.cpp" line="867"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>提醒</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="108"/> + <location filename="../qt-ui/mainwindow.cpp" line="110"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="199"/> + <location filename="../qt-ui/mainwindow.cpp" line="201"/> <source>UDDF files (*.uddf *.UDDF)</source> - <translation type="unfinished"/> + <translation>UDDF 檔案 (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="744"/> + <location filename="../qt-ui/mainwindow.cpp" line="746"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> + <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> </context> <context> @@ -1302,7 +1338,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="85"/> <source>Defaults</source> - <translation type="unfinished"/> + <translation>預設值</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="95"/> @@ -1317,12 +1353,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"/> + <translation>語言</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> <source>Lists and Tables</source> - <translation type="unfinished"/> + <translation>列表與表單</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="147"/> @@ -1352,17 +1388,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="197"/> <source>Display Invalid</source> - <translation type="unfinished"/> + <translation>顯示無效</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="214"/> <source>Default Cylinder</source> - <translation type="unfinished"/> + <translation>預設氣瓶</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="220"/> <source>Use Default Cylinder</source> - <translation type="unfinished"/> + <translation>使用預設氣瓶</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="256"/> @@ -1372,17 +1408,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="263"/> <source>Metric</source> - <translation type="unfinished"/> + <translation>公制</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="273"/> <source>Imperial</source> - <translation type="unfinished"/> + <translation>英制</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="283"/> <source>Personalize</source> - <translation type="unfinished"/> + <translation>個人化</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="307"/> @@ -1392,12 +1428,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"/> + <translation>meter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"/> + <translation>feet</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1412,22 +1448,22 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"/> + <translation>liter</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"/> + <translation>cu ft</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"/> + <translation>攝氏</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"/> + <translation>華氏</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1437,17 +1473,17 @@ Please, remove them first.</source> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"/> + <translation>pO₂</translation> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"/> + <translation>pN₂</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"/> + <translation>系統預設</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1487,7 +1523,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="453"/> <source>Ascent/Descent speed denominator</source> - <translation type="unfinished"/> + <translation>上升／下降速度分母</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="460"/> @@ -1502,14 +1538,14 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="502"/> <source>Show</source> - <translation type="unfinished"/> + <translation>顯示</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="533"/> <location filename="../qt-ui/preferences.ui" line="574"/> <location filename="../qt-ui/preferences.ui" line="615"/> <source>threshold</source> - <translation type="unfinished"/> + <translation>門檻</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="592"/> @@ -1524,52 +1560,52 @@ Please, remove them first.</source> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"/> + <translation>最大 ppO2</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> <source>EAD END EADD</source> - <translation type="unfinished"/> + <translation>EAD END EADD</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="681"/> <source>Dive computer reported ceiling</source> - <translation type="unfinished"/> + <translation>潛水電腦回報的深度</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="704"/> <source>draw ceiling red</source> - <translation type="unfinished"/> + <translation>以紅色繪製深度</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="715"/> <source>Calculated ceiling</source> - <translation type="unfinished"/> + <translation>計算的深度</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="738"/> <source>show all tissues</source> - <translation type="unfinished"/> + <translation>顯示所有組織</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="748"/> <source>3m increments</source> - <translation type="unfinished"/> + <translation>每 3m 增加</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="758"/> <source>Calculate NDL/TTS</source> - <translation type="unfinished"/> + <translation>計算 NDL/TTS</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="821"/> <source>GFLow at max depth</source> - <translation type="unfinished"/> + <translation>最大深度的 GFLow</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="781"/> <source>Misc</source> - <translation type="unfinished"/> + <translation>其它</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="14"/> @@ -1584,32 +1620,32 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="787"/> <source>GFLow</source> - <translation type="unfinished"/> + <translation>GFlow</translation> </message> <message> <location filename="../qt-ui/preferences.ui" line="804"/> <source>GFHigh</source> - <translation type="unfinished"/> + <translation>GFhigh</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="193"/> + <location filename="../qt-ui/preferences.cpp" line="195"/> <source>Restart required</source> - <translation type="unfinished"/> + <translation>需要重新啟動</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="194"/> + <location filename="../qt-ui/preferences.cpp" line="196"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"/> + <translation>您必須重新啟動 Subsurface 來正確載入新的語言</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Open Default Log File</source> - <translation type="unfinished"/> + <translation>開啟預設的日誌檔案</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="227"/> + <location filename="../qt-ui/preferences.cpp" line="229"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> + <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> </context> <context> @@ -1617,17 +1653,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"/> + <translation>預覽</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"/> + <translation>列印</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>關閉</translation> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1640,7 +1676,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printlayout.cpp" line="25"/> <source>Dive#</source> - <translation>潛水編號#</translation> + <translation>潛水編號 #</translation> </message> <message> <location filename="../qt-ui/printlayout.cpp" line="26"/> @@ -1678,7 +1714,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="23"/> <source>Print options</source> - <translation type="unfinished"/> + <translation>列印選項</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="41"/> @@ -1728,29 +1764,29 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/printoptions.ui" line="219"/> <source>Sizing heights (% of layout)</source> - <translation type="unfinished"/> + <translation>調整高度 (版面的 %)</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="256"/> <source>Profile height (43% - 85%)</source> - <translation type="unfinished"/> + <translation>潛水記錄欄位高度 (43% - 85%)</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="278"/> <source>Other data height (8% - 17%)</source> - <translation type="unfinished"/> + <translation>其餘資料欄位的高度 (8% - 17%)</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="338"/> <source>Notes height (0% - 52%)</source> - <translation type="unfinished"/> + <translation>潛水筆記欄位高度 (0% - 52%)</translation> </message> <message> <location filename="../qt-ui/printoptions.ui" line="354"/> <location filename="../qt-ui/printoptions.ui" line="370"/> <location filename="../qt-ui/printoptions.ui" line="386"/> <source>0</source> - <translation type="unfinished"/> + <translation>0</translation> </message> </context> <context> @@ -1778,17 +1814,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/profilegraphics.cpp" line="201"/> <source>Hide events</source> - <translation type="unfinished"/> + <translation>隱藏事件</translation> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="202"/> <source>Hide all %1 events?</source> - <translation type="unfinished"/> + <translation>隱藏所有 %1 事件？</translation> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="223"/> <source>Remove the selected event?</source> - <translation type="unfinished"/> + <translation>移除所選擇的事件？</translation> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="224"/> @@ -1799,78 +1835,78 @@ Please, remove them first.</source> <location filename="../qt-ui/profilegraphics.cpp" line="387"/> <location filename="../qt-ui/profilegraphics.cpp" line="389"/> <source>unknown divecomputer</source> - <translation type="unfinished"/> + <translation>未知的潛水電腦</translation> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="467"/> <source>Set Duration: 10 minutes</source> - <translation type="unfinished"/> + <translation>設定區間: 10 分鐘</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="513"/> + <location filename="../qt-ui/profilegraphics.cpp" line="511"/> <source>Scale</source> - <translation type="unfinished"/> + <translation>比例</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="514"/> + <location filename="../qt-ui/profilegraphics.cpp" line="512"/> <source>Ruler</source> - <translation type="unfinished"/> + <translation>尺規</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="516"/> + <location filename="../qt-ui/profilegraphics.cpp" line="514"/> <source>Measure properties of dive segments</source> - <translation type="unfinished"/> + <translation>潛水項目的量測設定</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="517"/> + <location filename="../qt-ui/profilegraphics.cpp" line="515"/> <source>Scale your dive to screen size</source> - <translation type="unfinished"/> + <translation>調整潛水至螢幕大小</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="530"/> + <location filename="../qt-ui/profilegraphics.cpp" line="528"/> <source>Edit</source> <translation>編輯</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="616"/> - <source>Pn2</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="614"/> + <source>pN</source> + <translation>pN</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="642"/> - <source>PHE</source> - <translation type="unfinished"/> + <location filename="../qt-ui/profilegraphics.cpp" line="640"/> + <source>pHe</source> + <translation>pHe</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="666"/> - <source>PO2</source> - <translation>PO2</translation> + <location filename="../qt-ui/profilegraphics.cpp" line="664"/> + <source>pO</source> + <translation>pO</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="754"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> + <location filename="../qt-ui/profilegraphics.cpp" line="752"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1004"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="756"/> - <location filename="../qt-ui/profilegraphics.cpp" line="1008"/> + <location filename="../qt-ui/profilegraphics.cpp" line="754"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1006"/> <source>EAN%1</source> - <translation type="unfinished"/> + <translation>EAN%1</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1014"/> <source>Bailing out to OC</source> <translation>跳脫至 OC</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1018"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1016"/> <source> begin</source> <comment>Starts with space!</comment> <translation>開始</translation> </message> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1019"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1017"/> <source> end</source> <comment>Starts with space!</comment> <translation>結束</translation> @@ -1879,72 +1915,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1618"/> + <location filename="../qt-ui/models.cpp" line="1606"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1623"/> + <location filename="../qt-ui/models.cpp" line="1611"/> <source>Dive #%1 - %2</source> - <translation type="unfinished"/> + <translation>潛水 #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1614"/> <source>Max depth: %1 %2</source> - <translation type="unfinished"/> + <translation>最大深度: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1633"/> + <location filename="../qt-ui/models.cpp" line="1621"/> <source>Duration: %1 min</source> - <translation type="unfinished"/> + <translation>時間: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1638"/> + <location filename="../qt-ui/models.cpp" line="1626"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1628"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1642"/> + <location filename="../qt-ui/models.cpp" line="1630"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1632"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1637"/> <source>Notes:</source> <translation>記錄：</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1656"/> + <location filename="../qt-ui/models.cpp" line="1644"/> <source>Divemaster:</source> <translation>導潛：</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> + <location filename="../qt-ui/models.cpp" line="1646"/> <source>Buddy:</source> <translation>潛伴：</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1660"/> + <location filename="../qt-ui/models.cpp" line="1648"/> <source>Suit:</source> <translation>防寒衣：</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1662"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1652"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -1957,9 +1993,9 @@ Please, remove them first.</source> <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="723"/> + <location filename="../qt-ui/diveplanner.cpp" line="736"/> <source>Remove this Point</source> - <translation type="unfinished"/> + <translation>移除此點</translation> </message> <message> <location filename="../qt-ui/kmessagewidget.cpp" line="58"/> @@ -1984,7 +2020,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/globe.cpp" line="242"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"/> + <translation>移動地圖, 並且雙擊來設定潛水位置</translation> </message> </context> <context> @@ -2005,12 +2041,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/shifttimes.ui" line="20"/> <source>Shift selected times</source> - <translation type="unfinished"/> + <translation>位移所選擇的時間</translation> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="37"/> <source>Shift times of selected dives by</source> - <translation type="unfinished"/> + <translation>位移所選擇潛水的時間，根據 </translation> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="73"/> @@ -2020,12 +2056,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/shifttimes.ui" line="83"/> <source>earlier</source> - <translation type="unfinished"/> + <translation>較早</translation> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="90"/> <source>later</source> - <translation type="unfinished"/> + <translation>較晚</translation> </message> </context> <context> @@ -2043,53 +2079,53 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/about.cpp" line="23"/> <source>&License</source> - <translation type="unfinished"/> + <translation>& 許可</translation> </message> <message> <location filename="../qt-ui/about.cpp" line="24"/> <source>&Website</source> - <translation type="unfinished"/> + <translation>& 網站</translation> </message> </context> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="314"/> <source>Webservice</source> <translation>網頁服務</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="356"/> <source>Connecting...</source> <translation>連結...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="372"/> <source>Download finished</source> - <translation type="unfinished"/> + <translation>下載結束</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="386"/> <source>Download error: %1</source> - <translation type="unfinished"/> + <translation>下載失敗: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="395"/> <source>Connection Error: </source> <translation>連結錯誤:</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="396"/> <source>Invalid user identifier!</source> - <translation>錯誤的使用者Id!</translation> + <translation>錯誤的使用者 Id !</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="397"/> <source>Cannot parse response!</source> <translation>回覆無法解析!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/> <source>Download Success!</source> <translation>下載成功!</translation> </message> @@ -2099,23 +2135,23 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/tableview.cpp" line="26"/> <source>Add Cylinder</source> - <translation type="unfinished"/> + <translation>新增氣瓶</translation> </message> </context> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>Description</source> - <translation type="unfinished"/> + <translation>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="771"/> + <location filename="../qt-ui/models.cpp" line="759"/> <source>bar</source> <translation>bar</translation> </message> @@ -2123,20 +2159,20 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1550"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1548"/> <source>Information</source> - <translation type="unfinished"/> + <translation>資訊</translation> </message> </context> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>Description</source> - <translation type="unfinished"/> + <translation>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="643"/> + <location filename="../qt-ui/models.cpp" line="631"/> <source>kg</source> <translation>kg</translation> </message> @@ -2145,18 +2181,18 @@ Please, remove them first.</source> <name>WebServices</name> <message> <location filename="../qt-ui/webservices.ui" line="14"/> - <source>Download Location Data</source> + <source>Webservice Connection</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> <source>Status:</source> - <translation type="unfinished"/> + <translation>狀態: </translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="32"/> <source>Enter your ID here</source> - <translation type="unfinished"/> + <translation>於此處輸入您的 ID </translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="39"/> @@ -2166,7 +2202,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/webservices.ui" line="63"/> <source>User ID</source> - <translation>使用者 ID</translation> + <translation>使用者 ID </translation> </message> <message> <location filename="../qt-ui/webservices.ui" line="80"/> @@ -2179,104 +2215,114 @@ Please, remove them first.</source> <translation>上傳</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="237"/> <source>Operation timed out</source> - <translation type="unfinished"/> + <translation>操作時間結束</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="258"/> <source>Transfering data...</source> - <translation type="unfinished"/> + <translation>移轉資料...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Type</source> <translation>類型</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="403"/> + <location filename="../qt-ui/models.cpp" line="391"/> <source>Weight</source> <translation>配重</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="463"/> + <location filename="../qt-ui/models.cpp" line="451"/> <source>Clicking here will remove this weigthsystem.</source> - <translation type="unfinished"/> + <translation>按此處移除配重系統</translation> </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1409"/> <source>Year > Month / Trip</source> - <translation type="unfinished"/> + <translation>年 + > 月 / 旅程</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1410"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1411"/> <source>Duration Total</source> - <translation type="unfinished"/> + <translation>時間 +全部</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1412"/> <source> Average</source> - <translation type="unfinished"/> + <translation> +平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1413"/> <source> Shortest</source> - <translation type="unfinished"/> + <translation> +最短</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1414"/> <source> Longest</source> - <translation type="unfinished"/> + <translation> +最長</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1415"/> <source>Depth (%1) Average</source> - <translation type="unfinished"/> + <translation>深度 (%1) +平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> - <location filename="../qt-ui/models.cpp" line="1431"/> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1422"/> <source> Minimum</source> - <translation type="unfinished"/> + <translation> +最小</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1417"/> + <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1423"/> <source> Maximum</source> - <translation type="unfinished"/> + <translation> +最大</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> + <location filename="../qt-ui/models.cpp" line="1418"/> <source>SAC (%1) Average</source> - <translation type="unfinished"/> + <translation>耗氣量 (%1) +平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1433"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Temp. (%1) Average</source> - <translation type="unfinished"/> + <translation>溫度 (%1) +平均</translation> </message> </context> <context> @@ -2345,9 +2391,9 @@ Maximum</source> </message> <message> <location filename="../divelist.c" line="488"/> - <location filename="../planner.c" line="96"/> - <location filename="../planner.c" line="774"/> - <location filename="../planner.c" line="775"/> + <location filename="../planner.c" line="97"/> + <location filename="../planner.c" line="782"/> + <location filename="../planner.c" line="783"/> <location filename="../statistics.c" line="356"/> <location filename="../statistics.c" line="367"/> <source>air</source> @@ -2381,10 +2427,10 @@ Maximum</source> <message> <location filename="../file.c" line="107"/> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="308"/> - <location filename="../file.c" line="310"/> - <location filename="../file.c" line="394"/> - <location filename="../file.c" line="396"/> + <location filename="../file.c" line="311"/> + <location filename="../file.c" line="313"/> + <location filename="../file.c" line="397"/> + <location filename="../file.c" line="399"/> <source>Failed to read '%s'</source> <translation>無法讀取 '%s'</translation> </message> @@ -2395,8 +2441,8 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="348"/> - <location filename="../file.c" line="350"/> + <location filename="../file.c" line="351"/> + <location filename="../file.c" line="353"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> @@ -2673,23 +2719,23 @@ Maximum</source> <translation>無法開啟樣板 (%s)/%s</translation> </message> <message> - <location filename="../planner.c" line="98"/> + <location filename="../planner.c" line="99"/> <location filename="../statistics.c" line="360"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="133"/> + <location filename="../planner.c" line="134"/> <source>Can't find gas %d/%d</source> <translation>無法找到氣源 %d/%d</translation> </message> <message> - <location filename="../planner.c" line="315"/> + <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> <translation>太多氣體混合</translation> </message> <message> - <location filename="../planner.c" line="493"/> + <location filename="../planner.c" line="501"/> <source>%s Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f @@ -2702,42 +2748,42 @@ Subsurface 潛水計畫 </translation> </message> <message> - <location filename="../planner.c" line="534"/> + <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s </translation> </message> <message> - <location filename="../planner.c" line="543"/> + <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> <translation>在 %.*f %s 停留 %d:%02d min - 時間運行 %d:%02u 於 %s </translation> </message> <message> - <location filename="../planner.c" line="554"/> + <location filename="../planner.c" line="562"/> <source>Switch gas to %s </source> <translation>更換氣體至 %s </translation> </message> <message> - <location filename="../planner.c" line="562"/> + <location filename="../planner.c" line="570"/> <source>Gas consumption: </source> <translation>氣體消耗: </translation> </message> <message> - <location filename="../planner.c" line="573"/> + <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> <translation>%.0f%s of %s </translation> </message> <message> - <location filename="../planner.c" line="776"/> + <location filename="../planner.c" line="784"/> <source>ean</source> <translation>ean</translation> </message> @@ -2759,7 +2805,8 @@ T:%.1f %s</translation> <location filename="../profile.c" line="1216"/> <source>%s V:%.2f %s</source> - <translation type="unfinished"/> + <translation>%s +V:%.2f %s</translation> </message> <message> <location filename="../profile.c" line="1302"/> @@ -2772,7 +2819,8 @@ Calculated ceiling %.0f %s</source> <location filename="../profile.c" line="1309"/> <source>%s Tissue %.0fmin: %.0f %s</source> - <translation type="unfinished"/> + <translation>%s +組織 %.0fmin: %.0f %s</translation> </message> <message> <location filename="../profile.c" line="1256"/> @@ -2901,20 +2949,21 @@ TTS:%umin (calc)</source> <message> <location filename="../profile.c" line="1406"/> <source>%sT: %d:%02d min</source> - <translation type="unfinished"/> + <translation>%sT: %d:%02d min</translation> </message> <message> <location filename="../profile.c" line="1410"/> <location filename="../profile.c" line="1414"/> <location filename="../profile.c" line="1418"/> <source>%s %sD:%.1f%s</source> - <translation type="unfinished"/> + <translation>%s %sD:%.1f%s</translation> </message> <message> <location filename="../profile.c" line="1422"/> <source>%s %sD:%.1f%s </source> - <translation type="unfinished"/> + <translation>%s %sD:%.1f%s +</translation> </message> <message> <location filename="../profile.c" line="1426"/> @@ -2930,12 +2979,12 @@ TTS:%umin (calc)</source> <message> <location filename="../profile.c" line="1441"/> <source>%s %sP:%d %s</source> - <translation type="unfinished"/> + <translation>%s %sP:%d %s</translation> </message> <message> <location filename="../qt-gui.cpp" line="291"/> <source>C</source> - <translation type="unfinished"/> + <translation>C</translation> </message> <message> <location filename="../qt-gui.cpp" line="295"/> @@ -2966,7 +3015,7 @@ TTS:%umin (calc)</source> <message> <location filename="../dive.c" line="13"/> <source>boat</source> - <translation>船</translation> + <translation>船潛</translation> </message> <message> <location filename="../dive.c" line="13"/> @@ -2981,17 +3030,17 @@ TTS:%umin (calc)</source> <message> <location filename="../dive.c" line="14"/> <source>deep</source> - <translation>深</translation> + <translation>深潛</translation> </message> <message> <location filename="../dive.c" line="14"/> <source>cavern</source> - <translation>大地洞</translation> + <translation>地洞</translation> </message> <message> <location filename="../dive.c" line="14"/> <source>ice</source> - <translation>冰</translation> + <translation>冰潛</translation> </message> <message> <location filename="../dive.c" line="15"/> @@ -3046,7 +3095,7 @@ TTS:%umin (calc)</source> <message> <location filename="../dive.c" line="18"/> <source>video</source> - <translation>攝影</translation> + <translation>影片</translation> </message> <message> <location filename="../dive.c" line="18"/> |