From eccac1321f512d820ac25aa89f6f7cce50fdd6df Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 8 Oct 2015 10:02:42 +0100 Subject: Deal with weird transifex issue involving leading space Apparently transifex drops the leading space in the translation string and then at runtime the string no longer matches. So let's just code this differently. This of course creates a new string but that new string should be the string that transifex already asks people to translate... Signed-off-by: Dirk Hohndel --- qt-models/divetripmodel.cpp | 4 +- translations/subsurface_source.ts | 103 ++++++++++++++++++++------------------ 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index fcba4a570..819bb5463 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -62,9 +62,9 @@ QVariant TripItem::data(int column, int role) const d = d->next; } if (countShown < trip->nrdives) - shownText = tr(" (%1 shown)").arg(countShown); + shownText = tr("(%1 shown)").arg(countShown); if (trip->location && *trip->location) - ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives) + shownText; + ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives) + " " + shownText; else ret = get_trip_date_string(trip->when, trip->nrdives) + shownText; break; diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 2da570bc5..3e9cb5be4 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -2096,12 +2096,12 @@ DiveLocationModel - + Create a new dive site, copying relevant information from the current dive. - + Create a new dive site with this name @@ -3620,6 +3620,11 @@ p, li { white-space: pre-wrap; } Dive sites on same coordinates + + + Tags + + Dive Site @@ -3648,7 +3653,7 @@ p, li { white-space: pre-wrap; } - + Dive site management @@ -3669,7 +3674,7 @@ p, li { white-space: pre-wrap; } - + You are editing a dive site @@ -3679,7 +3684,7 @@ p, li { white-space: pre-wrap; } - + Location @@ -3748,8 +3753,8 @@ p, li { white-space: pre-wrap; } - - + + Notes @@ -4004,103 +4009,103 @@ p, li { white-space: pre-wrap; } - - + + Trip notes - + Trip location - - - - + + + + /min - + Deepest dive - + Shallowest dive - + Highest total SAC of a dive - + Lowest total SAC of a dive - + Average total SAC of all selected dives - + Highest temperature - + Lowest temperature - + Average temperature of all selected dives - + Longest dive - + Shortest dive - + Average length of all selected dives - + These gases could be mixed from Air and using: - + and - + New dive site - + Discard the changes? - + You are about to discard your changes. @@ -4761,7 +4766,7 @@ mixed from Air and using: - + Cancel @@ -4826,28 +4831,28 @@ mixed from Air and using: - + Opening datafile from older version - + You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct. - + Open dive log file - + Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*) - + Contacting cloud service... @@ -4862,7 +4867,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil - + Warning @@ -4890,7 +4895,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil - + Please, first finish the current edition before trying to do another. @@ -5158,12 +5163,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a - + Connect to facebook text placeholder - + Disconnect @@ -5188,14 +5193,14 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a - + Dive Site Layout - - + + / @@ -5433,31 +5438,31 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a - + Sync to cloud in the background? - + Save Password locally? - + Subsurface web service - + Default user ID - + Save user ID locally? @@ -6887,7 +6892,7 @@ Not all images have timestamps in the range between TripItem - (%1 shown) + (%1 shown) -- cgit v1.2.3-70-g09d2