Thread: [Piklab-svn] SF.net SVN: piklab:[2856] trunk/piklab_kde4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2856
          http://piklab.svn.sourceforge.net/piklab/?rev=2856&view=rev
Author:   azhyd
Date:     2012-03-16 06:28:28 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
merge from trunk

Modified Paths:
--------------
    trunk/piklab_kde4/CMakeLists.txt
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/cmake/FindLIBUSB.cmake
    trunk/piklab_kde4/cmake/FindReadline.cmake
    trunk/piklab_kde4/cmake/Piklab.cmake
    trunk/piklab_kde4/config.h.cmake
    trunk/piklab_kde4/po/cs.po
    trunk/piklab_kde4/po/de.po
    trunk/piklab_kde4/po/es.po
    trunk/piklab_kde4/po/fr.po
    trunk/piklab_kde4/po/hu.po
    trunk/piklab_kde4/po/it.po
    trunk/piklab_kde4/po/piklab.pot
    trunk/piklab_kde4/src/common/cli/cli_interactive.cpp
    trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt
    trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt
    trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt
    trunk/piklab_kde4/src/piklab-prog/cmdline.cpp
    trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt
    trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt
    trunk/piklab_kde4/src/progs/list/prog_list_ui.cpp
    trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp

Removed Paths:
-------------
    trunk/piklab_kde4/piklab-prog-qt4.spec
    trunk/piklab_kde4/piklab.spec

Property Changed:
----------------
    trunk/piklab_kde4/


Property changes on: trunk/piklab_kde4
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/piklab:2822-2855

Modified: trunk/piklab_kde4/CMakeLists.txt
===================================================================

--- trunk/piklab_kde4/CMakeLists.txt	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/CMakeLists.txt	2012-03-16 06:28:28 UTC (rev 2856)
@@ -1,5 +1,5 @@
 project(piklab)
-set(VERSION "0.15.11")
+set(VERSION "0.15.12")
 
 
 if(WIN32)

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/Changelog	2012-03-16 06:28:28 UTC (rev 2856)
@@ -1,3 +1,6 @@
+0.15.13 (14 March 2012)
+* add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
+
 0.15.12 (19 February 2012)
 * added support for 18F2XK22/18F4XK22 [patch by Micheal Vrolijk]
 * added support for 16F1829 and 16F1507 [patch by Gál Zsolt]

Modified: trunk/piklab_kde4/cmake/FindLIBUSB.cmake
===================================================================
--- trunk/piklab_kde4/cmake/FindLIBUSB.cmake	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/cmake/FindLIBUSB.cmake	2012-03-16 06:28:28 UTC (rev 2856)
@@ -26,5 +26,8 @@
 if (LIBUSB_FOUND)
   EXEC_PROGRAM(libusb-config ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE LIBUSB_VERSION)
   message(STATUS "LIBUSB version: ${LIBUSB_VERSION}")
+else (LIBUSB_FOUND)
+  message(FATAL_ERROR "Could not find \"libusb-config\"")
 endif (LIBUSB_FOUND)
+
 set(HAVE_USB ${LIBUSB_FOUND})

Modified: trunk/piklab_kde4/cmake/FindReadline.cmake
===================================================================
--- trunk/piklab_kde4/cmake/FindReadline.cmake	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/cmake/FindReadline.cmake	2012-03-16 06:28:28 UTC (rev 2856)
@@ -1,22 +1,25 @@
-# Try to find readline
+# - Try to find Readline
+# Once done this will define
+# READLINE_FOUND - System has readline
+# READLINE_INCLUDE_DIRS - The readline include directories
+# READLINE_LIBRARIES - The libraries needed to use readline
+# READLINE_DEFINITIONS - Compiler switches required for using readline
 
-find_path(LIBREADLINE_INCLUDE_DIR
-  NAMES readline/readline.h
-)
+find_package ( PkgConfig )
+pkg_check_modules ( PC_READLINE QUIET readline )
+set ( READLINE_DEFINITIONS ${PC_READLINE_CFLAGS_OTHER} )
 
-find_library(LIBREADLINE_LIBRARY
-  NAMES readline
-)
+find_path ( READLINE_INCLUDE_DIR readline/readline.h
+      HINTS ${PC_READLINE_INCLUDEDIR} ${PC_READLINE_INCLUDE_DIRS}
+      PATH_SUFFIXES readline )
 
-find_library(LIBHISTORY_LIBRARY
-  NAMES history
-)
+find_library ( READLINE_LIBRARY NAMES readline
+      HINTS ${PC_READLINE_LIBDIR} ${PC_READLINE_LIBRARY_DIRS} )
 
-set(LIBREADLINE_PROCESS_INCLUDES LIBREADLINE_INCLUDE_DIR)
-set(LIBREADLINE_PROCESS_LIBS LIBREADLINE_LIBRARY)
-libfind_process(LIBREADLINE)
+set ( READLINE_LIBRARIES ${READLINE_LIBRARY} )
+set ( READLINE_INCLUDE_DIRS ${READLINE_INCLUDE_DIR} )
 
-set(LIBHISTORY_PROCESS_LIBS LIBHISTORY_LIBRARY)
-libfind_process(LIBHISTORY)
-
-set(HAVE_READLINE ${LIBREADLINE_FOUND})
+include ( FindPackageHandleStandardArgs )
+# handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args ( readline DEFAULT_MSG READLINE_LIBRARY READLINE_INCLUDE_DIR )

Modified: trunk/piklab_kde4/cmake/Piklab.cmake
===================================================================
--- trunk/piklab_kde4/cmake/Piklab.cmake	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/cmake/Piklab.cmake	2012-03-16 06:28:28 UTC (rev 2856)
@@ -44,15 +44,12 @@
 
   ADD_DEFINITIONS(-static-libgcc)
   SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -static-libgcc")
-
 else(WIN32)
   find_package(LIBUSB REQUIRED)
   include_directories(${LIBUSB_INCLUDE_DIRS})
 
-  #find_package(Curses REQUIRED)
-
   find_package(Readline REQUIRED)
-  include_directories(${LIBREADLINE_INCLUDE_DIRS})
+  include_directories(${READLINE_INCLUDE_DIRS})
 
   find_package(ParallelPortSupport)
 endif(WIN32)

Modified: trunk/piklab_kde4/config.h.cmake
===================================================================
--- trunk/piklab_kde4/config.h.cmake	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/config.h.cmake	2012-03-16 06:28:28 UTC (rev 2856)
@@ -3,7 +3,7 @@
 #cmakedefine HAVE_USB 1
 #cmakedefine LIBUSB_VERSION "${LIBUSB_VERSION}"
 
-#cmakedefine HAVE_READLINE 1
+#cmakedefine READLINE_FOUND 1
 
 #cmakedefine HAVE_PPDEV 1
 #cmakedefine HAVE_PPBUS 1

Deleted: trunk/piklab_kde4/piklab-prog-qt4.spec
===================================================================
--- trunk/piklab_kde4/piklab-prog-qt4.spec	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/piklab-prog-qt4.spec	2012-03-16 06:28:28 UTC (rev 2856)
@@ -1,108 +0,0 @@
-%define name    piklab-prog-qt4
-%define version 0.15.9
-%define release %mkrel 1
-
-Summary:       Command-line programmer and debugger for PIC and dsPIC microcontrollers
-Name:          %{name}
-Version:       %{version}
-Release:       %{release}
-Source0:       piklab-%{version}.tar.bz2
-License:       GPL
-Group:         Development/Other
-Url:           http://piklab.sourceforge.net/
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: qt3-devel
-BuildRequires: libusb-devel libreadline-devel ncurses-devel
-BuildRequires: cmake
-
-Conflicts:     piklab piklab-prog-qt3
-Packager:      ha...@kd...
-Provides:      piklab-prog piklab-hex
-
-%description
-"piklab-prog" is a command-line programmer and debugger for PIC and dsPIC
-microcontrollers. It supports GPSim, and several Microchip and direct
-programmers.
-"piklab-hex" is a command-line utility to manipulate hex files.
-"piklab-coff" is a command-line utility to view COFF and library files.
-
-%prep
-%setup -q -n piklab-%{version}
-
-%build
-export QTDIR=%_prefix/%{_lib}/qt4
-export LD_LIBRARY_PATH=$QTDIR/%{_lib}:$LD_LIBRARY_PATH
-export PATH=$QTDIR/bin:$PATH
-export QTLIB=$QTDIR/%{_lib}
-cmake -DQT_ONLY=1 -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr/.
-%make
-
-%install
-rm -rf %{buildroot}
-%makeinstall
-%find_lang piklab
-
-%clean
-rm -rf %{buildroot}
-
-%files -f piklab.lang
-%defattr(755,root,root)
-%{_bindir}/*
-%defattr(644,root,root,755)
-%{_mandir}/man1/*
-%{_docdir}/piklab/*
-
-%changelog
-* Tue Jun 22 2010 Nicolas Hadacek <ha...@kd...> 0.15.9-1mdv2008.0
-- new upstream release
-* Sat May 1 2010 Nicolas Hadacek <ha...@kd...> 0.15.8-1mdv2008.0
-- new upstream release
-* Sat Oct 24 2009 Nicolas Hadacek <ha...@kd...> 0.15.7-1mdv2008.0
-- new upstream release
-* Tue Sep 29 2009 Nicolas Hadacek <ha...@kd...> 0.15.6-1mdv2008.0
-- new upstream release
-* Wed Sep 9 2009 Nicolas Hadacek <ha...@kd...> 0.15.5-1mdv2008.0
-- new upstream release
-* Sat Nov 22 2008 Nicolas Hadacek <ha...@kd...> 0.15.4-1mdv2008.0
-- new upstream release
-* Sun Mar 23 2008 Nicolas Hadacek <ha...@kd...> 0.15.3-1mdv2008.0
-- new upstream release
-* Sun Nov 25 2007 Nicolas Hadacek <ha...@kd...> 0.15.2-1mdv2008.0
-- new upstream release
-* Sun Nov 11 2007 Nicolas Hadacek <ha...@kd...> 0.15.1-1mdv2008.0
-- fixes
-* Sat Oct 20 2007 Nicolas Hadacek <ha...@kd...> 0.15.0-1mdv2007.0
-- new release
-* Fri Aug 17 2007 Nicolas Hadacek <ha...@kd...> 0.14.5-1mdv2007.0
-- fix
-* Sun Aug 5 2007 Nicolas Hadacek <ha...@kd...> 0.14.4-1mdv2007.0
-- fixes
-* Fri Jul 27 2007 Nicolas Hadacek <ha...@kd...> 0.14.3-1mdk
-- fixes + new features
-* Mon Apr 9 2007 Nicolas Hadacek <ha...@kd...> 0.14.2-1mdk
-- fixes + new features
-* Sun Mar 11 2007 Nicolas Hadacek <ha...@kd...> 0.14.1-1mdk
-- fixes + new feature
-* Sun Mar 4 2007 Nicolas Hadacek <ha...@kd...> 0.14.0-1mdk
-- new version
-* Thu Feb 8 2007 Nicolas Hadacek <ha...@kd...> 0.13.3-1mdk
-- fixes
-* Wed Jan 31 2007 Nicolas Hadacek <ha...@kd...> 0.13.2-1mdk
-- fixes
-* Sun Jan 28 2007 Nicolas Hadacek <ha...@kd...> 0.13.1-1mdk
-- fixes
-* Fri Jan 19 2007 Nicolas Hadacek <ha...@kd...> 0.13.0-1mdk
-- new version
-* Mon Oct 16 2006 Nicolas Hadacek <ha...@kd...> 0.12.2-1mdk
-- fixes
-* Sun Oct 15 2006 Nicolas Hadacek <ha...@kd...> 0.12.1-1mdk
-- fixes
-* Sun Oct 1 2006 Nicolas Hadacek <ha...@kd...> 0.12.0-1mdk
-- new version
-* Tue Sep 5 2006 Nicolas Hadacek <ha...@kd...> 0.11.2-1mdk
-- more fixes
-* Wed Aug 23 2006 Nicolas Hadacek <ha...@kd...> 0.11.1-1mdk
-- some fixes
-* Sun Aug 20 2006 Nicolas Hadacek <ha...@kd...> 0.11.0-1mdk
-- new version

Deleted: trunk/piklab_kde4/piklab.spec
===================================================================
--- trunk/piklab_kde4/piklab.spec	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/piklab.spec	2012-03-16 06:28:28 UTC (rev 2856)
@@ -1,155 +0,0 @@
-%define name    piklab
-%define version 0.15.9
-%define release %mkrel 1
-
-Summary:       IDE for applications based on PIC microcontrollers
-Name:          %{name}
-Version:       %{version}
-Release:       %{release}
-Source0:       %{name}-%{version}.tar.bz2
-License:       GPL
-Group:         Development/Other
-Url:           http://piklab.sourceforge.net/
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: kdelibs-devel
-#BuildRequires: kdebase-devel
-BuildRequires: libusb-devel libreadline-devel ncurses-devel
-BuildRequires: cmake
-
-Packager:      ha...@kd...
-Conflicts:     piklab-prog-qt3 piklab-prog-qt4
-
-%description
-Piklab is an integrated development environment for applications based on
-PIC microcontrollers. Gputils tools are used for assembling. Microchip
-programmers and several direct programmers are supported.
-
-%prep
-%setup -q -n piklab-%{version}
-
-%build
-cmake -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr/ .
-%make
-
-%install
-rm -rf %{buildroot}
-%makeinstall
-mkdir -p %{buildroot}%{_iconsdir} %{buildroot}%{_miconsdir} %{buildroot}%{_liconsdir}
-convert -resize 16x16 piklab.xpm %{buildroot}%{_miconsdir}/piklab.png
-convert -resize 32x32 piklab.xpm %{buildroot}%{_iconsdir}/piklab.png
-convert -resize 48x48 piklab.xpm %{buildroot}%{_liconsdir}/piklab.png
-%find_lang piklab
-
-%clean
-rm -rf %{buildroot}
-
-%post
-%{update_menus}
-
-%postun
-%{clean_menus}
-
-%files -f piklab.lang
-%defattr(755,root,root)
-%{_bindir}/*
-%defattr(644,root,root,755)
-%{_datadir}/apps/piklab
-%{_datadir}/applications/kde/piklab.desktop
-%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/mimelnk/application/x-piklab.desktop
-%{_datadir}/apps/katepart/syntax/*
-%{_mandir}/man1/*
-%{_docdir}/HTML/en/piklab
-%{_docdir}/piklab/*
-%{_miconsdir}/piklab.png
-%{_iconsdir}/piklab.png
-%{_liconsdir}/piklab.png
-
-%changelog
-* Tue Jun 22 2010 Nicolas Hadacek <ha...@kd...> 0.15.9-1mdv2008.0
-- new upstream release
-* Sat May 1 2010 Nicolas Hadacek <ha...@kd...> 0.15.8-1mdv2008.0
-- new upstream release
-* Sat Oct 24 2009 Nicolas Hadacek <ha...@kd...> 0.15.7-1mdv2008.0
-- new upstream release
-* Tue Sep 29 2009 Nicolas Hadacek <ha...@kd...> 0.15.6-1mdv2008.0
-- new upstream release
-* Wed Sep 9 2009 Nicolas Hadacek <ha...@kd...> 0.15.5-1mdv2008.0
-- new upstream release
-* Sat Nov 22 2008 Nicolas Hadacek <ha...@kd...> 0.15.4-1mdv2008.0
-- new upstream release
-* Sun Mar 23 2008 Nicolas Hadacek <ha...@kd...> 0.15.3-1mdv2008.0
-- new upstream release
-* Sun Nov 25 2007 Nicolas Hadacek <ha...@kd...> 0.15.2-1mdv2008.0
-- new upstream release
-* Sun Nov 11 2007 Nicolas Hadacek <ha...@kd...> 0.15.1-1mdv2008.0
-- fixes
-* Sat Oct 20 2007 Nicolas Hadacek <ha...@kd...> 0.15.0-1mdv2007.0
-- new release
-* Fri Aug 17 2007 Nicolas Hadacek <ha...@kd...> 0.14.5-1mdv2007.0
-- fix
-* Sun Aug 5 2007 Nicolas Hadacek <ha...@kd...> 0.14.4-1mdv2007.0
-- fixes
-* Fri Jul 27 2007 Nicolas Hadacek <ha...@kd...> 0.14.3-1mdk
-- fixes + new features
-* Mon Apr 9 2007 Nicolas Hadacek <ha...@kd...> 0.14.2-1mdk
-- fixes + new features
-* Sun Mar 11 2007 Nicolas Hadacek <ha...@kd...> 0.14.1-1mdk
-- fixes + new feature
-* Sun Mar 4 2007 Nicolas Hadacek <ha...@kd...> 0.14.0-1mdk
-- new version
-* Thu Feb 8 2007 Nicolas Hadacek <ha...@kd...> 0.13.3-1mdk
-- fixes
-* Wed Jan 31 2007 Nicolas Hadacek <ha...@kd...> 0.13.2-1mdk
-- fixes
-* Sun Jan 28 2007 Nicolas Hadacek <ha...@kd...> 0.13.1-1mdk
-- fixes
-* Fri Jan 19 2007 Nicolas Hadacek <ha...@kd...> 0.13.0-1mdk
-- new version
-* Mon Oct 16 2006 Nicolas Hadacek <ha...@kd...> 0.12.2-1mdk
-- fixes
-* Sun Oct 15 2006 Nicolas Hadacek <ha...@kd...> 0.12.1-1mdk
-- fixes
-* Sun Oct 1 2006 Nicolas Hadacek <ha...@kd...> 0.12.0-1mdk
-- new version
-* Tue Sep 7 2006 Nicolas Hadacek <ha...@kd...> 0.11.2-2mdk
-- fix linking of piklab-prog
-* Tue Sep 5 2006 Nicolas Hadacek <ha...@kd...> 0.11.2-1mdk
-- more fixes
-* Wed Aug 23 2006 Nicolas Hadacek <ha...@kd...> 0.11.1-1mdk
-- some fixes
-* Sun Aug 20 2006 Nicolas Hadacek <ha...@kd...> 0.11.0-1mdk
-- new version
-* Thu Jul 6 2006 Nicolas Hadacek <ha...@kd...> 0.10.0-1mdk
-- new version
-* Mon May 29 2006 Nicolas Hadacek <ha...@kd...> 0.9.0-1mdk
-- new version
-* Sat May 6 2006 Nicolas Hadacek <ha...@kd...> 0.8.0-1mdk
-- new version
-* Sat Apr 22 2006 Nicolas Hadacek <ha...@kd...> 0.7.0-1mdk
-- new version
-* Wed Mar 23 2006 Nicolas Hadacek <ha...@kd...> 0.6.1-1mdk
-- fixes
-* Wed Mar 15 2006 Nicolas Hadacek <ha...@kd...> 0.6.0-1mdk
-- new version
-* Wed Mar 1 2006 Nicolas Hadacek <ha...@kd...> 0.5.2-1mdk
-- some fixes
-* Tue Feb 28 2006 Nicolas Hadacek <ha...@kd...> 0.5.1-1mdk
-- some fixes
-* Sun Feb 26 2006 Nicolas Hadacek <ha...@kd...> 0.5.0-1mdk
-- new version
-* Sat Feb 18 2006 Nicolas Hadacek <ha...@kd...> 0.4.2-1mdk
-- some fixes
-* Tue Feb 14 2006 Nicolas Hadacek <ha...@kd...> 0.4.1-1mdk
-- some fixes
-* Sun Feb 12 2006 Nicolas Hadacek <ha...@kd...> 0.4-1mdk
-- new version
-* Sun Jan 22 2006 Nicolas Hadacek <ha...@kd...> 0.3.1-1mdk
-- freeze fix for serial ICD2
-* Sat Jan 21 2006 Nicolas Hadacek <ha...@kd...> 0.3-1mdk
-- new version
-* Tue Dec 12 2005 Nicolas Hadacek <ha...@kd...> 0.2-1mdk
-- new version
-* Thu Jun 29 2005 Nicolas Hadacek <ha...@kd...> 0.1-1mdk
-- initial release

Modified: trunk/piklab_kde4/po/cs.po
===================================================================
--- trunk/piklab_kde4/po/cs.po	2012-03-16 05:58:52 UTC (rev 2855)
+++ trunk/piklab_kde4/po/cs.po	2012-03-16 06:28:28 UTC (rev 2856)
@@ -9,17 +9,18 @@
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=138852&atid=743140\n"
-"POT-Creation-Date: 2010-06-22 21:48+0200\n"
+"POT-Creation-Date: 2012-03-10 16:58-0800\n"
 "PO-Revision-Date: 2007-06-18 10:07+0200\n"
 "Last-Translator: Milan Horák\n"
 "Language-Team: Czech <cs...@li...>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:802
+#: common/nokde/nokde_kcmdlineargs.cpp:809
 msgid ""
 "\n"
 "%1:\n"
@@ -27,7 +28,7 @@
 "\n"
 "%1:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:946
+#: common/nokde/nokde_kcmdlineargs.cpp:953
 msgid ""
 "\n"
 "Arguments:\n"
@@ -35,7 +36,7 @@
 "\n"
 "Parametry:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:885
+#: common/nokde/nokde_kcmdlineargs.cpp:892
 msgid ""
 "\n"
 "Options:\n"
@@ -43,11 +44,11 @@
 "\n"
 "Přepínače:\n"
 
-#: progs/base/generic_prog.cpp:208
+#: progs/base/generic_prog.cpp:206
 msgid "  %1 = %2 V: error in voltage level."
 msgstr "  %1 = %2 V:chybné napětí."
 
-#: progs/icd2/base/icd2_debug_specific.cpp:59
+#: progs/icd2/base/icd2_debug_specific_16f.cpp:59
 msgid ""
 "  According to ICD2 manual, instruction at address 0x0 should be \"nop\"."
 msgstr "Podle příručky k ICD2 by instrukce na adrese 0x0 měla být \"nop\"."
@@ -61,7 +62,7 @@
 msgid "  Blank check successful"
 msgstr "Zkouška prázdné paměti úspěšná"
 
-#: progs/icd2/base/icd2_debug.cpp:308
+#: progs/icd2/base/icd2_debug.cpp:207
 msgid "  Debug executive version: %1"
 msgstr "Ladění prováděcí verze: %1"
 
@@ -98,10 +99,10 @@
 msgid "  Osccal is unchanged."
 msgstr "OSCCAL nezměněna. "
 
-#: progs/icd2/base/icd2_debug_specific.cpp:87
-#: progs/icd2/base/icd2_debug_specific.cpp:94
-#: progs/icd2/base/icd2_debug_specific.cpp:175
-#: progs/icd2/base/icd2_debug_specific.cpp:258
+#: progs/icd2/base/icd2_debug_specific_16f.cpp:87
+#: progs/icd2/base/icd2_debug_specific_16f.cpp:94
+#: progs/icd2/base/icd2_debug_specific_16f.cpp:184
+#: progs/icd2/base/icd2_debug_specific_18f.cpp:85
 msgid "  PC is not at address %1 (%2)"
 msgstr "PC není na adrese %1 (%2)"
 
@@ -117,7 +118,7 @@
 msgid "  Replace invalid osccal with backup value."
 msgstr "Nahradit neplatnou OSCCAL záložní hodnotou."
 
-#: progs/base/generic_prog.cpp:125
+#: progs/base/generic_prog.cpp:124
 msgid "  Set target self powered: %1"
 msgstr "Nastavit cílové zařízení s vlastním napájením: %1"
 
@@ -125,11 +126,11 @@
 msgid "  Unknown or incorrect device (Read id is %1)."
 msgstr "Neznámý nebo nesprávný mikrokontrolér (Načtené ID je %1)."
 
-#: progs/pickit2/base/pickit2_prog.cpp:63
+#: progs/pickit2/base/pickit2_prog.cpp:68
 msgid "  Uploading PICkit2 firmware..."
 msgstr "Nahrávám firmware pro PICkit2..."
 
-#: progs/icd2/base/icd2_debug.cpp:240
+#: progs/icd2/base/icd2_debug_specific.cpp:106
 msgid "  Verify debug executive"
 msgstr "Ověřit ladění prováděcí části"
 
@@ -137,7 +138,7 @@
 msgid "  Verify memory: %1"
 msgstr "Ověřit paměť: %1"
 
-#: progs/icd2/base/icd2_debug.cpp:237
+#: progs/icd2/base/icd2_debug_specific.cpp:102
 msgid "  Write debug executive"
 msgstr "Zapsat ladění prováděcí části"
 
@@ -211,15 +212,15 @@
 msgid "%1 (magic id: %2)"
 msgstr ""
 
-#: devices/pic/base/pic.cpp:212
+#: devices/pic/base/pic.cpp:206
 msgid "%1 (proc. %2; rev. %3.%4)"
 msgstr "%1 (proc. %2; rev. %3.%4)"
 
-#: devices/pic/base/pic.cpp:206 devices/pic/base/pic.cpp:216
+#: devices/pic/base/pic.cpp:200 devices/pic/base/pic.cpp:210
 msgid "%1 (rev. %2)"
 msgstr "%1 (rev. %2)"
 
-#: devices/pic/base/pic.cpp:209
+#: devices/pic/base/pic.cpp:203
 #, fuzzy
 msgid "%1 (rev. %2.%3)"
 msgstr "%1 (rev. %2)"
@@ -244,15 +245,15 @@
 msgid "%1 bytes"
 msgstr "%1 bytů"
 
-#: devices/pic/base/pic_config.cpp:333
+#: devices/pic/base/pic_config.cpp:341
 msgid "%1 for block %2"
 msgstr "%1 pro blok %2"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:883
+#: common/nokde/nokde_kcmdlineargs.cpp:890
 msgid "%1 options"
 msgstr "%1 přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:647
+#: common/nokde/nokde_kcmdlineargs.cpp:654
 msgid "%1 was written by somebody who wants to remain anonymous."
 msgstr "%1 byl napsán někým, kdo chce zůstat neznámý."
 
@@ -284,19 +285,19 @@
 "%1: Mazání jen tohoto rozsahu není zvoleným programátorem podporováno. Tato "
 "operace vymaže celý mikrokontrolér a obnoví ostatní rozsahy paměti."
 
-#: libgui/toplevel.cpp:273
+#: libgui/toplevel.cpp:274
 msgid "&Advanced..."
 msgstr "&Pokročilé."
 
-#: devices/gui/memory_editor.cpp:285 libgui/toplevel.cpp:265
+#: devices/gui/memory_editor.cpp:285 libgui/toplevel.cpp:266
 msgid "&Blank Check"
 msgstr "&Kontrola vymazání"
 
-#: libgui/toplevel.cpp:287
+#: libgui/toplevel.cpp:288
 msgid "&Break<Translators: it is the verb>"
 msgstr ""
 
-#: libgui/toplevel.cpp:239
+#: libgui/toplevel.cpp:240
 msgid "&Build Project"
 msgstr "&Sestavit projekt"
 
@@ -304,11 +305,11 @@
 msgid "&Clear"
 msgstr "&Vyčistit"
 
-#: libgui/toplevel.cpp:241
+#: libgui/toplevel.cpp:242
 msgid "&Compile File"
 msgstr "Z&kompilovat soubor"
 
-#: libgui/toplevel.cpp:308
+#: libgui/toplevel.cpp:309
 msgid "&Config Generator..."
 msgstr "&Generátor konfigurace..."
 
@@ -316,70 +317,70 @@
 msgid "&Configure Email Address..."
 msgstr "&Nastavit e-mail."
 
-#: libgui/toplevel.cpp:251
+#: libgui/toplevel.cpp:252
 msgid "&Connect"
 msgstr "&Připojit"
 
-#. i18n: file ./data/app_data/piklabui.rc line 102
+#. i18n: file: data/app_data/piklabui.rc:102
+#. i18n: ectx: Menu (debug)
 #: rc.cpp:30
-#, no-c-format
 msgid "&Debugger"
 msgstr "&Ladění"
 
-#: libgui/toplevel.cpp:306
+#: libgui/toplevel.cpp:307
 #, fuzzy
 msgid "&Device Selector..."
 msgstr "Rozpoznávání mikrokontroléru:"
 
-#: libgui/toplevel.cpp:255
+#: libgui/toplevel.cpp:256
 msgid "&Disconnect"
 msgstr "O&dpojit"
 
-#: libgui/toplevel.cpp:289
+#: libgui/toplevel.cpp:290
 #, fuzzy
 msgid "&Disconnect/Stop"
 msgstr "O&dpojit"
 
-#: devices/gui/memory_editor.cpp:284 libgui/toplevel.cpp:263
+#: devices/gui/memory_editor.cpp:284 libgui/toplevel.cpp:264
 msgid "&Erase"
 msgstr "&Smazat"
 
-#: libgui/toplevel.cpp:56
+#: libgui/toplevel.cpp:57
 #, fuzzy
 msgid "&Find Files..."
 msgstr "Přidat soubor..."
 
-#: libgui/toplevel.cpp:57
+#: libgui/toplevel.cpp:58
 msgid "&KHexTerm..."
 msgstr ""
 
-#: libgui/toplevel.cpp:169
+#: libgui/toplevel.cpp:170
 msgid "&New Source File..."
 msgstr "&Nový zdrojový soubor..."
 
-#: libgui/toplevel.cpp:55
+#: libgui/toplevel.cpp:56
 msgid "&Pikloops..."
 msgstr "&Pikloops..."
 
-#: devices/gui/memory_editor.cpp:281 libgui/toplevel.cpp:257
+#: devices/gui/memory_editor.cpp:281 libgui/toplevel.cpp:258
 msgid "&Program"
 msgstr "&Programovat"
 
-#. i18n: file ./data/app_data/piklabui.rc line 63
+#. i18n: file: data/app_data/piklabui.rc:63
+#. i18n: ectx: Menu (project)
 #: rc.cpp:21
-#, no-c-format
 msgid "&Project"
 msgstr "&Projekt"
 
-#: devices/gui/memory_editor.cpp:283 libgui/toplevel.cpp:261
+#: devices/gui/memory_editor.cpp:283 libgui/toplevel.cpp:262
 msgid "&Read"
 msgstr "&Načíst"
 
-#: libgui/toplevel.cpp:209
+#: libgui/toplevel.cpp:210
 msgid "&Reset Layout"
 msgstr "Obnovit &Rozvržení"
 
-#: libgui/toplevel.cpp:267 libgui/toplevel.cpp:281
+#: libgui/toplevel.cpp:268 libgui/toplevel.cpp:282
 msgid "&Run"
 msgstr "&Spustit"
 
@@ -387,20 +388,20 @@
 msgid "&Select"
 msgstr "&Vybrat"
 
-#: libgui/toplevel.cpp:279
+#: libgui/toplevel.cpp:280
 #, fuzzy
 msgid "&Start/Step"
 msgstr "&Krokovat"
 
-#: libgui/toplevel.cpp:269
+#: libgui/toplevel.cpp:270
 msgid "&Stop"
 msgstr "Za&stavit"
 
-#: libgui/toplevel.cpp:310
+#: libgui/toplevel.cpp:311
 msgid "&Template Generator..."
 msgstr "Generá&tor šablon..."
 
-#: devices/gui/memory_editor.cpp:282 libgui/toplevel.cpp:259
+#: devices/gui/memory_editor.cpp:282 libgui/toplevel.cpp:260
 msgid "&Verify"
 msgstr "O&věřit"
 
@@ -408,7 +409,7 @@
 msgid "&Zero"
 msgstr "Vy&nulovat"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:545
+#: common/nokde/nokde_kcmdlineargs.cpp:552
 msgid "'%1' missing."
 msgstr "'%1' chybí."
 
@@ -421,7 +422,7 @@
 msgid "*** Aborted ***"
 msgstr "*** Přerušeno ***"
 
-#: tools/list/compile_process.cpp:230
+#: tools/list/compile_process.cpp:232
 msgid "*** Error ***"
 msgstr "*** Chyba ***"
 
@@ -429,7 +430,7 @@
 msgid "*** Error executing command ***"
 msgstr ""
 
-#: progs/custom/base/custom_prog.cpp:89 tools/list/compile_process.cpp:227
+#: progs/custom/base/custom_prog.cpp:89 tools/list/compile_process.cpp:229
 msgid "*** Exited with status: %1 ***"
 msgstr "*** Ukončeno se zprávou: %1 ***"
 
@@ -438,7 +439,7 @@
 msgid "*** Success ***"
 msgstr "*** Úspěch ***"
 
-#: tools/list/compile_process.cpp:237
+#: tools/list/compile_process.cpp:239
 msgid "*** Timeout ***"
 msgstr "*** Timeout ***"
 
@@ -450,15 +451,15 @@
 msgid "*yes*"
 msgstr "*ano*"
 
-#: devices/pic/base/pic_config.cpp:85
+#: devices/pic/base/pic_config.cpp:90
 msgid "00"
 msgstr "00"
 
-#: devices/pic/base/pic_config.cpp:85
+#: devices/pic/base/pic_config.cpp:90
 msgid "01"
 msgstr "01"
 
-#: devices/pic/base/pic_config.cpp:86
+#: devices/pic/base/pic_config.cpp:91
 msgid "10"
 msgstr "10"
 
@@ -466,15 +467,15 @@
 msgid "10MHz crystal"
 msgstr "10MHz krystal"
 
-#: devices/pic/base/pic_config.cpp:86
+#: devices/pic/base/pic_config.cpp:91
 msgid "11"
 msgstr "11"
 
-#: devices/pic/base/pic_config.cpp:237
+#: devices/pic/base/pic_config.cpp:245
 msgid "12-bit external bus"
 msgstr ""
 
-#: devices/pic/base/pic_config.cpp:238
+#: devices/pic/base/pic_config.cpp:246
 msgid "16-bit external bus"
 msgstr ""
 
@@ -498,11 +499,11 @@
 msgid "18J Family"
 msgstr "Rodina 18Xx"
 
-#: devices/pic/base/pic_config.cpp:239
+#: devices/pic/base/pic_config.cpp:247
 msgid "20-bit external bus"
 msgstr ""
 
-#: devices/mem24/base/mem24.h:25
+#: devices/mem24/base/mem24.h:24
 #, fuzzy
 msgid "24 EEPROM"
 msgstr "EEPROM dat"
@@ -527,23 +528,23 @@
 msgid "33F Family"
 msgstr "Rodina 18Xx"
 
-#: devices/pic/base/pic_config.cpp:223
+#: devices/pic/base/pic_config.cpp:231
 msgid "4 MHz"
 msgstr "4 MHz"
 
-#: devices/pic/base/pic_config.cpp:226
+#: devices/pic/base/pic_config.cpp:234
 msgid "4x PLL enable"
 msgstr ""
 
-#: devices/pic/base/pic_config.cpp:243
+#: devices/pic/base/pic_config.cpp:251
 msgid "5-bit address mask mode"
 msgstr ""
 
-#: devices/pic/base/pic_config.cpp:242
+#: devices/pic/base/pic_config.cpp:250
 msgid "7-bit address mask mode"
 msgstr ""
 
-#: devices/pic/base/pic_config.cpp:222
+#: devices/pic/base/pic_config.cpp:230
 msgid "8 MHz"
 msgstr "8 MHz"
 
@@ -668,7 +669,7 @@
 "<a href=\"http://www.htsoft.com\">PICC</a> je kompilátor jazyka C "
 "distribuovaný společností HTSoft."
 
-#: progs/gui/port_selector.cpp:88
+#: progs/gui/port_selector.cpp:90
 #, fuzzy
 msgid "<a href=\"%1\">See Piklab homepage for help</a>."
 msgstr "Nápověda na internetu."
@@ -709,8 +710,8 @@
 
 #: libgui/hex_editor.cpp:77
 msgid ""
-"<b>Warning:</b> hex file seems to be incompatible with the selected device %"
-"1:<br>%2"
+"<b>Warning:</b> hex file seems to be incompatible with the selected device "
+"%1:<br>%2"
 msgstr ""
 "<b>Upozornění:</b> hex soubor není určen pro zvolený mikrokontrolér %1:<br>%2"
 
@@ -764,7 +765,7 @@
 msgid "<qt><b>Command for executable detection:</b><br>%1<br>"
 msgstr "<qt><b>Příkaz pro zjištění spustitelnosti:</b><br>%1<br>"
 
-#: tools/gui/tool_config_widget.cpp:110
+#: tools/gui/tool_config_widget.cpp:108
 msgid "<qt>This values will be placed after the linked objects.</qt>"
 msgstr "<qt>Tyto hodnoty budou umístěny za připojené objekty.</qt>"
 
@@ -793,19 +794,19 @@
 msgid "Acknowledge bit incorrect"
 msgstr "Nesprávný potvrzovací bit"
 
-#: devices/pic/base/pic_config.cpp:124 devices/pic/base/pic_config.cpp:127
+#: devices/pic/base/pic_config.cpp:130 devices/pic/base/pic_config.cpp:133
 msgid "Active high"
 msgstr "Aktivní vysoká"
 
-#: devices/pic/base/pic_config.cpp:125 devices/pic/base/pic_config.cpp:128
+#: devices/pic/base/pic_config.cpp:131 devices/pic/base/pic_config.cpp:134
 msgid "Active low"
 msgstr "Aktivní nízká"
 
-#: libgui/project_manager.cpp:189 libgui/toplevel.cpp:235
+#: libgui/project_manager.cpp:189 libgui/toplevel.cpp:236
 msgid "Add Current File"
 msgstr "Přidat aktuální soubor"
 
-#: libgui/toplevel.cpp:233
+#: libgui/toplevel.cpp:234
 msgid "Add Object File..."
 msgstr "Přidat objektový soubor."
 
@@ -814,7 +815,7 @@
 msgid "Add Object Files..."
 msgstr "Přidat objektový soubor."
 
-#: libgui/toplevel.cpp:231
+#: libgui/toplevel.cpp:232
 msgid "Add Source File..."
 msgstr "Přidat zdrojový soubor..."
 
@@ -843,7 +844,7 @@
 msgid "Address"
 msgstr "Adresa"
 
-#: devices/pic/base/pic_config.cpp:145
+#: devices/pic/base/pic_config.cpp:151
 msgid "Address bus width (in bits)"
 msgstr "Šířka adresové sběrnice (v bitech)"
 
@@ -851,11 +852,11 @@
 msgid "Advanced Dialog"
 msgstr "Pokročilé"
 
-#: devices/pic/base/pic_config.cpp:418
+#: devices/pic/base/pic_config.cpp:426
 msgid "All"
 msgstr "Vše"
 
-#: libgui/toplevel.cpp:592
+#: libgui/toplevel.cpp:611
 msgid "All Files"
 msgstr "Všechny soubory"
 
@@ -898,20 +899,20 @@
 "Celá paměť dat EEPROM nebo její část je chráněná a nemůže být zachována. "
 "Přesto pokračovat?"
 
-#: devices/pic/base/pic_config.cpp:293
+#: devices/pic/base/pic_config.cpp:301
 msgid "Allow multiple reconfigurations"
 msgstr ""
 
-#: devices/pic/base/pic_config.cpp:292
+#: devices/pic/base/pic_config.cpp:300
 msgid "Allow only one reconfiguration"
 msgstr ""
 
-#: devices/pic/base/pic_config.cpp:297
+#: devices/pic/base/pic_config.cpp:305
 #, fuzzy
 msgid "Alternate"
 msgstr "Alternativy"
 
-#: devices/pic/base/pic_config.cpp:294
+#: devices/pic/base/pic_config.cpp:302
 #, fuzzy
 msgid "Alternate I2C pins"
 msgstr "Alternativy"
@@ -920,7 +921,7 @@
 msgid "Alternatives"
 msgstr "Alternativy"
 
-#: devices/pic/base/pic_config.cpp:121
+#: devices/pic/base/pic_config.cpp:127
 msgid "Analog"
 msgstr "Analogový"
 
@@ -944,7 +945,7 @@
 msgid "Arguments not recognized."
 msgstr "Parametry nerozpoznány"
 
-#: tools/gui/tool_config_widget.cpp:41
+#: tools/gui/tool_config_widget.cpp:39
 msgid "Arguments:"
 msgstr "Parametry:"
 
@@ -982,13 +983,13 @@
 msgstr ""
 "Nejméně jedna hodnota (na adrese %1) je definována mimo paměťový rozsah."
 
-#: devices/mem24/mem24/mem24_memory.cpp:85 devices/pic/pic/pic_memory.cpp:555
+#: devices/mem24/mem24/mem24_memory.cpp:85 devices/...
 
[truncated message content]

Thread: [Piklab-svn] SF.net SVN: piklab:[2856] trunk/piklab_kde4

IDE for PIC microcontrollers

piklab-svn