Changeset a784b15 in subsurface


Ignore:
Timestamp:
May 1, 2017, 9:24:02 PM (3 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
15c20a3
Parents:
257f7c08
git-author:
Stefan Fuchs <sfuchs@…> (04/27/17 12:47:51)
git-committer:
Dirk Hohndel <dirk@…> (05/01/17 21:24:02)
Message:

Update translation and strings for gas usage in stats

Giving the string " and " to transiflex seems to fail and/or
it's highly possible that the translators make a mistake by
translating it into "and" or " and" or "and ".
Change the string to "and" and hard code the whitespaces before and after.

Change O2 to O₂ in statistics.

Translate "He" and "O2" in statistics.

Signed-off-by: Stefan Fuchs <sfuchs@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • desktop-widgets/tab-widgets/TabDiveStatistics.cpp

    r257f7c08 ra784b15  
    121121        if (he_tot.mliter || o2_tot.mliter) {
    122122                gasUsedString.append(tr("These gases could be\nmixed from Air and using:\n"));
    123                 if (he_tot.mliter)
    124                         gasUsedString.append(QString("He: %1").arg(get_volume_string(he_tot, true)));
     123                if (he_tot.mliter) {
     124                        gasUsedString.append(tr("He"));
     125                        gasUsedString.append(QString(": %1").arg(get_volume_string(he_tot, true)));
     126                }
    125127                if (he_tot.mliter && o2_tot.mliter)
    126                         gasUsedString.append(tr(" and "));
    127                 if (o2_tot.mliter)
    128                         gasUsedString.append(QString("O2: %2\n").arg(get_volume_string(o2_tot, true)));
     128                        gasUsedString.append(" ").append(tr("and")).append(" ");
     129                if (o2_tot.mliter) {
     130                        gasUsedString.append(tr("O₂"));
     131                        gasUsedString.append(QString(": %2\n").arg(get_volume_string(o2_tot, true)));
     132                }
    129133        }
    130134        ui->gasConsumption->setText(gasUsedString);
Note: See TracChangeset for help on using the changeset viewer.