From 517921e2e13b629854970afb2e1937d0986bde60 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 28 Sep 2017 18:41:29 +0200 Subject: [PATCH] update doc and remove a outdated file Update or fix a few strings in menus and tool tips --- README.txt | 7 ++-- gerbview/toolbars_gerber.cpp | 12 +++---- license_for_documentation.txt | 61 ----------------------------------- pcbnew/pcbframe.cpp | 4 +-- 4 files changed, 12 insertions(+), 72 deletions(-) delete mode 100644 license_for_documentation.txt diff --git a/README.txt b/README.txt index f88872e2be..b9b1446503 100644 --- a/README.txt +++ b/README.txt @@ -7,12 +7,13 @@ Files ----- AUTHORS.txt - The authors, contributors, document writers and translators list CMakeList.txt - Main CMAKE build tool script -COPYRIGHT.txt - A copy of the GNU General Public License Version 2 +copyright.h - A very short copy of the GNU General Public License to be included in new source files CTestConfig.cmake - Support for CTest and CDash testing tools Doxyfile - Doxygen config file for KiCad INSTALL.txt - The release (binary) installation instructions TODO.txt - Todo list (looks outdated) uncrustify.cfg - Uncrustify config file for uncrustify sources formatting tool +_clang-format - clang config file for clang-format sources formatting tool Subdirectories -------------- @@ -29,14 +30,14 @@ gerbview - Sourcecode of the gerber viewer helpers - Helper tools and utilities for development include - Interfaces to the common library kicad - Sourcecode of the project manager -lib_dxf - Sourcecode of the polygon library +lib_dxf - Sourcecode of the dxf reader/writer library new - Staging area for the new schematic library format pagelayout_editor - Sourcecode of the pagelayout editor patches - Collection of patches for external dependencies pcbnew - Sourcecode of the printed circuit board editor plugins - Sourcecode of the new plugin concept polygon - Sourcecode of the polygon library -potrace - Sourcecode of the potrace library +potrace - Sourcecode of the potrace library, used in bitmap2component qa - Testcases using the python interface resources - Resources for freedesktop mime-types for linux scripting - SWIG Python scripting definitions diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp index 6d68811d16..40b5ed0948 100644 --- a/gerbview/toolbars_gerber.cpp +++ b/gerbview/toolbars_gerber.cpp @@ -280,18 +280,18 @@ void GERBVIEW_FRAME::ReCreateOptToolbar( void ) m_optionsToolBar->AddSeparator(); m_optionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GBR_MODE_0, wxEmptyString, KiBitmap( gbr_select_mode0_xpm ), - _( "Show layers in raw mode \ - (could have problems with negative items when more than one gerber file is shown)" ), + _( "Show layers in raw mode\n" + "(could have problems with negative items when more than one gerber file is shown)" ), wxITEM_CHECK ); m_optionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GBR_MODE_1, wxEmptyString, KiBitmap( gbr_select_mode1_xpm ), - _( "Show layers in stacked mode \ - (show negative items without artifacts, sometimes slow)" ), + _( "Show layers in stacked mode\n" + "(show negative items without artifacts)" ), wxITEM_CHECK ); m_optionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GBR_MODE_2, wxEmptyString, KiBitmap( gbr_select_mode2_xpm ), - _( "Show layers in transparency mode \ - (show negative items without artifacts, sometimes slow)" ), + _( "Show layers in transparency mode\n" + "(show negative items without artifacts)" ), wxITEM_CHECK ); } else diff --git a/license_for_documentation.txt b/license_for_documentation.txt deleted file mode 100644 index 950da0f8b3..0000000000 --- a/license_for_documentation.txt +++ /dev/null @@ -1,61 +0,0 @@ - KiCad Free Documentation Licence - ================================ - - Copyright (c) jean-pierre Charras - Copyright (C) KiCad Developers - - Everyone is permitted to copy and distribute verbatim copies - of this licence document, but changing it is not allowed. - - KICAD FREE DOCUMENTATION LICENCE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 1. Permission is granted to make and distribute verbatim copies of this - manual or piece of documentation provided any copyright notice and this - permission notice are preserved on all copies. - - 2. Permission is granted to process this file or document through a - document processing system and, at your option and the option of any third - party, print the results, provided a printed document carries a copying - permission notice identical to this one. - - 3. Permission is granted to copy and distribute modified versions of this - manual or piece of documentation under the conditions for verbatim - copying, provided also that any sections describing licensing conditions - for this manual, such as, in particular, the GNU General Public Licence, - the GNU Library General Public Licence, and any wxWindows Licence are - included exactly as in the original, and provided that the entire - resulting derived work is distributed under the terms of a permission - notice identical to this one. - - 4. Permission is granted to copy and distribute translations of this - manual or piece of documentation into another language, under the above - conditions for modified versions, except that sections related to - licensing, including this paragraph, may also be included in translations - approved by the copyright holders of the respective licence documents in - addition to the original French or English. - - WARRANTY DISCLAIMER - - 5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE, - THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER - PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT - WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF - THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU. SHOULD THE MANUAL OR - PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL - ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR - REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE - LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR - CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE - MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF - DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD - PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF - DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp index 0f956c3c40..e243ff25de 100644 --- a/pcbnew/pcbframe.cpp +++ b/pcbnew/pcbframe.cpp @@ -1181,9 +1181,9 @@ void PCB_EDIT_FRAME::OnUpdatePCBFromSch( wxCommandEvent& event ) { if( Kiface().IsSingle() ) { - DisplayError( this, _( "Cannot update the PCB, because the Kicad is " + DisplayError( this, _( "Cannot update the PCB, because Pcbnew is " "opened in stand-alone mode. In order to create or update " - "PCBs from schematics, you need to launch the Kicad shell " + "PCBs from schematics, you need to launch the KiCad project manager " "and create a PCB project." ) ); return; }