From e07b4cbe86a06535fdd9cf104cd970057e52fa80 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 27 Jan 2014 09:48:17 +0100 Subject: [PATCH] github_plugin.cpp: in error message relative to"cannot get zip archive...", line 496, make the sentence relative to http GET command not translatable inside the full translated message. --- pcbnew/github/github_plugin.cpp | 4 +++- pcbnew/onleftclick.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp index 897674c9fb..38621098ae 100644 --- a/pcbnew/github/github_plugin.cpp +++ b/pcbnew/github/github_plugin.cpp @@ -493,9 +493,11 @@ void GITHUB_PLUGIN::remote_get_zip( const wxString& aRepoURL ) throw( IO_ERROR ) catch( boost::system::system_error& e ) { // https "GET" has faild, report this to API caller. - wxString fmt( _( "Cannot get/download Zip archive: '%s'\nfor library path: '%s'.\nReason: '%s'" ) ); + wxString errorcmd( wxT("https GET command failed") ); // Do not translate this message + wxString fmt( _( "%s\nCannot get/download Zip archive: '%s'\nfor library path: '%s'.\nReason: '%s'" ) ); string msg = StrPrintf( TO_UTF8( fmt ), + TO_UTF8( errorcmd ), zip_url.c_str(), TO_UTF8( aRepoURL ), e.what() ); diff --git a/pcbnew/onleftclick.cpp b/pcbnew/onleftclick.cpp index 28451e4b68..00b313d784 100644 --- a/pcbnew/onleftclick.cpp +++ b/pcbnew/onleftclick.cpp @@ -328,7 +328,7 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) if( IsLayerInList( EDGE_LAYER, getActiveLayer() ) ) { DisplayError( this, - _( "Texts not allowed on Edge Cut layers" ) ); + _( "Texts not allowed on Edge Cut layer" ) ); break; }