Changeset 6e63fd3 in git


Ignore:
Timestamp:
21/09/11 12:26:46 (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:
b775443
Parents:
fbc1d32
Message:

lib/codes.po,src/log.cc,src/mainfrm.cc,src/printwx.cc: Make more
messages translatable.

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

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rfbc1d32 r6e63fd3  
     1Wed Sep 21 11:25:53 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * lib/codes.po,src/log.cc,src/mainfrm.cc,src/printwx.cc: Make more
     4          messages translatable.
     5
    16Wed Sep 21 07:30:28 GMT 2011  Olly Betts <olly@survex.com>
    27
  • lib/codes.po

    rfbc1d32 r6e63fd3  
    550550msgstr "93"
    551551
     552#: ../src/printwx.cc:335
     553#, c-format
     554msgid "Couldn't write file `%s'"
     555msgstr "402"
     556
    552557#: ../src/message.c:227
    553558msgid "Bad memory access"
     
    11931198msgstr "205"
    11941199
    1195 #. TRANSLATORS: Aven menu items.  An '&' goes before the letter of any accelerator key.
    1196 #. The string "\t" separates the menu text and any accelerator key.
    11971200#. File->Open dialog:
    1198 #: ../src/mainfrm.cc:1701
    1199 msgid "Select a 3d file to view"
     1201#: ../src/mainfrm.cc:1714
     1202msgid "Select a survey file to view"
    12001203msgstr "206"
    12011204
     
    12081211msgid "All files"
    12091212msgstr "208"
     1213
     1214#: ../src/mainfrm.cc:1704
     1215msgid "All survey files"
     1216msgstr "229"
     1217
     1218#: ../src/mainfrm.cc:1706
     1219msgid "Survex svx files"
     1220msgstr "329"
     1221
     1222#: ../src/mainfrm.cc:1708
     1223msgid "Compass DAT and MAK files"
     1224msgstr "330"
     1225
     1226#: ../src/printwx.cc:328
     1227msgid "DXF files|*.dxf|SVG files|*.svg|Sketch files|*.sk|EPS files|*.eps|Compass PLT for use with Carto|*.plt|HPGL for plotters|*.hpgl"
     1228msgstr "96"
    12101229
    12111230#. TRANSLATORS: in the about box (summarising the purpose of aven)
     
    12481267msgstr "219"
    12491268
     1269#. TRANSLATORS: Aven menu items.  An '&' goes before the letter of any accelerator key.
     1270#. The string "\t" separates the menu text and any accelerator key.
    12501271#. TRANSLATORS: "File" menu.  The accelerators must be different within this group.
    12511272#. c.f. 201, 380, 381.
     
    13001321#. height values).
    13011322#~ msgid "Select a terrain file to view"
    1302 #~ msgstr "228"
     1323#~ msgstr ""
    13031324
    13041325#~ msgid "Terrain files"
    1305 #~ msgstr "229"
     1326#~ msgstr ""
     1327
     1328#. TRANSLATORS: %s will be replaced by the application name ("Aven" currently)
     1329msgid "%s Error Log"
     1330msgstr "228"
    13061331
    13071332#. TRANSLATORS: Used in the "Export" settings dialog
     
    16581683msgstr "317"
    16591684
     1685#: ../src/mainfrm.cc:2182
     1686msgid "Export Movie"
     1687msgstr "331"
     1688
    16601689#: ../src/mainfrm.cc:781
    16611690msgid "&Bounding Box\tCtrl+B"
     
    17171746msgstr "328"
    17181747
    1719 #. TRANSLATORS: UNUSED
    17201748#~ msgid "Open &Terrain…"
    1721 #~ msgstr "329"
    1722 
    1723 #. TRANSLATORS: UNUSED
     1749#~ msgstr ""
     1750
    17241751#~ msgid "Solid Su&rface"
    1725 #~ msgstr "330"
     1752#~ msgstr ""
    17261753
    17271754#. TRANSLATORS: number of stations found matching search
    17281755#, c-format
    17291756#~ msgid "%d found"
    1730 #~ msgstr "331"
     1757#~ msgstr ""
    17311758
    17321759#. TRANSLATORS: "Find stations" button label
     
    19802007msgstr "382"
    19812008
     2009#. TRANSLATORS: Title of file dialog to choose name and type of exported file.
     2010#: ../src/mainfrm.cc:721
     2011msgid "Export as:"
     2012msgstr "401"
     2013
    19822014#. TRANSLATORS: Title of the export dialog
    19832015#: ../src/printwx.cc:171
     
    20052037
    20062038#~ msgid "Pre&view"
    2007 #~ msgstr "401"
     2039#~ msgstr ""
    20082040
    20092041#~ msgid "&Cancel"
    2010 #~ msgstr "402"
     2042#~ msgstr ""
    20112043
    20122044#: ../src/printwx.cc:267
  • src/log.cc

    rfbc1d32 r6e63fd3  
    11//  log.cc - Error log window for Aven.
    22//
    3 //  Copyright (C) 2006 Olly Betts
     3//  Copyright (C) 2006,2011 Olly Betts
    44//
    55//  This program is free software; you can redistribute it and/or modify
     
    2626#include "gla.h"
    2727
    28 //#include "message.h"
    29 
    30 // FIXME: Make window title available for translation.
    3128MyLogWindow::MyLogWindow()
    32     : wxLogWindow(NULL,APP_NAME wxT(" Error Log"), false, false), first(true)
     29    : wxLogWindow(NULL,
     30                  wxString::Format(wmsg(/*%s Error Log*/228), APP_NAME).c_str(),
     31                  false, false),
     32      first(true)
    3333{
    3434}
  • src/mainfrm.cc

    rfbc1d32 r6e63fd3  
    17021702                     "|%s|*.xyz"CASE("*.XYZ")
    17031703                     "|%s|%s"),
    1704                      wxT("All survey files"),
     1704                     wmsg(/*All survey files*/229).c_str(),
    17051705                     wmsg(/*Survex 3d files*/207).c_str(),
    1706                      wxT("Survex svx files"),
     1706                     wmsg(/*Survex svx files*/329).c_str(),
    17071707                     wmsg(/*Compass PLT files*/324).c_str(),
    1708                      wxT("Compass DAT and MAK files"),
     1708                     wmsg(/*Compass DAT and MAK files*/330).c_str(),
    17091709                     wmsg(/*CMAP XYZ files*/325).c_str(),
    17101710                     wmsg(/*All files*/208).c_str(),
    17111711                     wxFileSelectorDefaultWildcardStr);
    17121712#endif
    1713     // FIXME: drop "3d" from this message?
    1714     wxFileDialog dlg(this, wmsg(/*Select a 3d file to view*/206),
     1713    wxFileDialog dlg(this, wmsg(/*Select a survey file to view*/206),
    17151714                     wxString(), wxString(),
    17161715                     filetypes, wxFD_OPEN|wxFD_FILE_MUST_EXIST);
     
    21812180    wxString baseleaf;
    21822181    wxFileName::SplitPath(m_File, NULL, NULL, &baseleaf, NULL, wxPATH_NATIVE);
    2183     wxFileDialog dlg(this, wxT("Export Movie"), wxString(),
     2182    wxFileDialog dlg(this, wmsg(/*Export Movie*/331), wxString(),
    21842183                     baseleaf + wxT(".mpg"),
    21852184                     wxT("MPEG|*.mpg|AVI|*.avi|QuickTime|*.mov|WMV|*.wmv;*.asf"),
  • src/printwx.cc

    rfbc1d32 r6e63fd3  
    325325    wxString baseleaf;
    326326    wxFileName::SplitPath(m_File, NULL, NULL, &baseleaf, NULL, wxPATH_NATIVE);
    327     wxFileDialog dlg(this, wxT("Export as:"), wxString(), baseleaf,
    328                      wxT("DXF files|*.dxf|SVG files|*.svg|Sketch files|*.sk|EPS files|*.eps|Compass PLT for use with Carto|*.plt|HPGL for plotters|*.hpgl"),
     327    wxFileDialog dlg(this, wmsg(/*Export as:*/401), wxString(), baseleaf,
     328                     wmsg(/*DXF files|*.dxf|SVG files|*.svg|Sketch files|*.sk|EPS files|*.eps|Compass PLT for use with Carto|*.plt|HPGL for plotters|*.hpgl*/96),
    329329                     wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
    330330    if (dlg.ShowModal() == wxID_OK) {
     
    333333                    m_layout.Labels, m_layout.Crosses,
    334334                    m_layout.Shots, m_layout.Surface)) {
    335             wxGetApp().ReportError(wxString::Format(wxT("Couldn't write file `%s'"), m_File.c_str()));
     335            wxString m = wxString::Format(wmsg(/*Couldn't write file `%s'*/402).c_str(),
     336                                          m_File.c_str());
     337            wxGetApp().ReportError(m);
    336338        }
    337339    }
Note: See TracChangeset for help on using the changeset viewer.