Changeset fbc1d32 in git


Ignore:
Timestamp:
21/09/11 08:31:28 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
6e63fd3
Parents:
2341559
Message:

lib/codes.po,src/dump3d.c,src/gfxcore.cc,src/mainfrm.cc: Make more
messages translatable. In the colour key for "colour by date",
change "No info" to "Undated".

git-svn-id: file:///home/survex-svn/survex/trunk@3743 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r2341559 rfbc1d32  
     1Wed Sep 21 07:30:28 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * lib/codes.po,src/dump3d.c,src/gfxcore.cc,src/mainfrm.cc: Make more
     4          messages translatable.  In the colour key for "colour by date",
     5          change "No info" to "Undated".
     6
    17Wed Sep 21 04:20:52 GMT 2011  Olly Betts <olly@survex.com>
    28
  • lib/codes.po

    r2341559 rfbc1d32  
    695695#: ../src/printwx.cc:257
    696696#: ../src/printwx.cc:660
     697#: ../src/mainfrm.cc:114
    697698msgid "Elevation"
    698699msgstr "118"
     
    892893#: ../src/printwx.cc:672
    893894#: ../src/printwx.cc:733
     895#: ../src/mainfrm.cc:118
    894896msgid "Scale"
    895897msgstr "154"
     
    11561158msgid "replace .err file with resorted version"
    11571159msgstr "183"
     1160
     1161#. TRANSLATORS: --help output for dump3d --rewind option
     1162msgid "rewind file and read it a second time"
     1163msgstr "204"
    11581164
    11591165#. TRANSLATORS: error message given by "*units tape 0 feet" - it's meaningless to say
     
    11791185
    11801186#~ msgid "Close"
    1181 #~ msgstr "204"
     1187#~ msgstr ""
    11821188
    11831189#. TRANSLATORS: for the title of the About box
     
    12491255
    12501256#~ msgid "&Quit\tCtrl+Q"
    1251 #~ msgstr "221"
     1257#~ msgstr ""
     1258
     1259#. TRANSLATORS: Used in the "colour key" for "colour by date" if there are
     1260#. surveys without date information.
     1261msgid "Undated"
     1262msgstr "221"
     1263
     1264#. TRANSLATORS: Used in the "colour key" for "colour by error" for surveys
     1265#. which aren't part of a loop and so have no error information.
     1266msgid "Not in loop"
     1267msgstr "290"
    12521268
    12531269#. TRANSLATORS: error from "*data normal newline from to tape compass clino"
     
    14201436
    14211437#: ../src/printwx.cc:241
     1438#: ../src/mainfrm.cc:110
    14221439msgid "Bearing"
    14231440msgstr "259"
     
    15031520
    15041521#~ msgid "&About…"
    1505 #~ msgstr "290"
     1522#~ msgstr ""
    15061523
    15071524#: ../src/mainfrm.cc:784
     
    20002017#, c-format
    20012018#~ msgid "Invalid regular expression: %s"
    2002 #~ msgstr "404"
     2019#~ msgstr ""
     2020
     2021#. TRANSLATORS: Title of dialog to edit a waypoint in a presentation.
     2022msgid "Edit Waypoint"
     2023msgstr "404"
    20032024
    20042025#. TRANSLATORS: %s will be replaced with "Aven" currently (and perhaps by "Survex" or other
  • src/dump3d.c

    r2341559 rfbc1d32  
    11/* dump3d.c */
    22/* Show raw contents of .3d file in text form */
    3 /* Copyright (C) 2001,2002,2006 Olly Betts
     3/* Copyright (C) 2001,2002,2006,2011 Olly Betts
    44 *
    55 * This program is free software; you can redistribute it and/or modify
     
    4545static struct help_msg help[] = {
    4646/*                              <-- */
    47    {HLP_ENCODELONG(0),          "only load the sub-survey with this prefix"},
    48    {HLP_ENCODELONG(1),          "rewind file and read it a second time"},
    49    {0, 0}
     47   {HLP_ENCODELONG(0),        /*only load the sub-survey with this prefix*/199, 0},
     48   {HLP_ENCODELONG(1),        /*rewind file and read it a second time*/204, 0},
     49   {0, 0, 0}
    5050};
    5151
  • src/gfxcore.cc

    r2341559 rfbc1d32  
    866866    int size = 0;
    867867    if (!m_Parent->HasCompleteDateInfo()) {
    868         GetTextExtent(wxT("No info"), &size, NULL);
     868        GetTextExtent(wmsg(/*Undated*/221), &size, NULL);
    869869    }
    870870
     
    914914    if (!m_Parent->HasCompleteDateInfo()) {
    915915        y += DEPTH_BAR_MARGIN;
    916         DrawIndicatorText(left, y, wxT("No info"));
     916        DrawIndicatorText(left, y, wmsg(/*Undated*/221));
    917917        y += DEPTH_BAR_BLOCK_HEIGHT;
    918918    }
     
    929929{
    930930    int total_block_height = DEPTH_BAR_BLOCK_HEIGHT * (GetNumDepthBands() - 1);
    931     // Always show the "Not a loop" legend for now (FIXME).
     931    // Always show the "Not in loop" legend for now (FIXME).
    932932    total_block_height += DEPTH_BAR_BLOCK_HEIGHT + DEPTH_BAR_MARGIN;
    933933    const int top = -(total_block_height + DEPTH_BAR_OFFSET_Y);
    934934
    935935    int size = 0;
    936     GetTextExtent(wxT("Not a loop"), &size, NULL);
     936    GetTextExtent(wmsg(/*Not in loop*/290), &size, NULL);
    937937
    938938    wxString* strs = new wxString[GetNumDepthBands()];
     
    975975
    976976    y += DEPTH_BAR_MARGIN;
    977     DrawIndicatorText(left, y, wxT("Not in loop"));
     977    DrawIndicatorText(left, y, wmsg(/*Not in loop*/290));
    978978    y += DEPTH_BAR_BLOCK_HEIGHT;
    979979
  • src/mainfrm.cc

    r2341559 rfbc1d32  
    8181public:
    8282    EditMarkDlg(wxWindow* parent, const PresentationMark & p)
    83         : wxDialog(parent, 500, wxString(wxT("Edit Waypoint")))
     83        : wxDialog(parent, 500, wmsg(/*Edit Waypoint*/404))
    8484    {
    8585        easting = new wxTextCtrl(this, 601, wxString::Format(wxT("%.3f"), p.GetX()));
     
    108108        vert->Add(coords, 0, wxALL, 8);
    109109        wxBoxSizer * r2 = new wxBoxSizer(wxHORIZONTAL);
    110         r2->Add(new wxStaticText(this, 614, wxT("Bearing: ")), 0, wxALIGN_CENTRE_VERTICAL);
     110        r2->Add(new wxStaticText(this, 614, wmsg(/*Bearing*/259) + wxT(": ")), 0, wxALIGN_CENTRE_VERTICAL);
    111111        r2->Add(angle);
    112112        vert->Add(r2, 0, wxALL, 8);
    113113        wxBoxSizer * r3 = new wxBoxSizer(wxHORIZONTAL);
    114         r3->Add(new wxStaticText(this, 615, wxT("Elevation: ")), 0, wxALIGN_CENTRE_VERTICAL);
     114        r3->Add(new wxStaticText(this, 615, wmsg(/*Elevation*/118) + wxT(": ")), 0, wxALIGN_CENTRE_VERTICAL);
    115115        r3->Add(tilt_angle);
    116116        vert->Add(r3, 0, wxALL, 8);
    117117        wxBoxSizer * r4 = new wxBoxSizer(wxHORIZONTAL);
    118         r4->Add(new wxStaticText(this, 616, wxT("Scale: ")), 0, wxALIGN_CENTRE_VERTICAL);
     118        r4->Add(new wxStaticText(this, 616, wmsg(/*Scale*/154) + wxT(": ")), 0, wxALIGN_CENTRE_VERTICAL);
    119119        r4->Add(scale);
    120120        r4->Add(new wxStaticText(this, 617, wxT(" (unused in perspective view)")),
Note: See TracChangeset for help on using the changeset viewer.